--- a/src/sound.c	Mon Aug 13 11:11:38 2007 +0200
+++ b/src/sound.c	Mon Aug 13 11:12:05 2007 +0200
@@ -69,7 +69,7 @@
 Play the named sound file on DEVICE's speaker at the specified volume
 \(0-100, default specified by the `bell-volume' variable).
 On Unix machines the sound file must be in the Sun/NeXT U-LAW format
-except under Linux where WAV files are also supported.  On Microsoft 
+except under Linux where WAV files are also supported.  On Microsoft
 Windows the sound file must be in WAV format.
   DEVICE defaults to the selected device.
 */
@@ -326,14 +326,12 @@
 */
        (device))
 {
-  struct device *d = decode_device(device);
-
 #ifdef HAVE_NAS_SOUND
-  if (DEVICE_CONNECTED_TO_NAS_P (d))
+  if (DEVICE_CONNECTED_TO_NAS_P (decode_device (device)))
     return Qt;
 #endif
 #ifdef HAVE_NATIVE_SOUND
-  if (DEVICE_ON_CONSOLE_P (d))
+  if (DEVICE_ON_CONSOLE_P (decode_device (device)))
     return Qt;
 #endif
   return Qnil;