3 files changed, 12 insertions, 3 deletions

diff --git a/libopie2/opiecore/device/odevice.cpp b/libopie2/opiecore/device/odevice.cpp
index e4233eb..aecccca 100644
--- a/libopie2/opiecore/device/odevice.cpp
+++ b/libopie2/opiecore/device/odevice.cpp
@@ -61,16 +61,17 @@
 #include <math.h>
 #include <stdlib.h>
 #include <signal.h>
 #include <sys/ioctl.h>
 #include <sys/time.h>
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
+#include <errno.h>
 #endif
 
 namespace Opie {
 namespace Core {
 
 static const char* PATH_PROC_CPUINFO = "/proc/cpuinfo";
 
 
@@ -744,25 +745,29 @@ void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter)
 {
     Opie::Core::OKeyFilter::inst()->remPreHandler(aFilter);
 }
 
 
 /**
  * @internal
  *
+ * Returns the volume back to the user preference after an alarm is finished.
+ *
  * @see changeMixerForAlarm
  */
 void ODevice::playingStopped() {
     if ( sender() )
 	const_cast<QObject*>(sender())->disconnect( this );
 
 #ifndef QT_NO_SOUND
     if ( d->m_sound >= 0 ) {
-        ::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol );
+        if (::ioctl ( d->m_sound, MIXER_WRITE( d->m_mixer ), &d->m_vol ) == -1)
+            qWarning( "ODevice::playingStopped() - "
+		      "unable to change volume back (%s)", strerror( errno ) );
         ::close ( d->m_sound );
     }
 #endif
 }
 
 
 /**
  * \brief Change the Volume for the Alarm and set it back after playing is finished
diff --git a/libopie2/opiecore/device/odevice_htc.cpp b/libopie2/opiecore/device/odevice_htc.cpp
index 44b33c0..7f82369 100644
--- a/libopie2/opiecore/device/odevice_htc.cpp
+++ b/libopie2/opiecore/device/odevice_htc.cpp
@@ -301,17 +301,19 @@ void HTC::buzzer( int sound )
     // device..
     if ( snd && snd->isFinished() ){
         changeMixerForAlarm( 0, "/dev/mixer", snd );
         snd->play();
     } else if( !snd ) {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
         if ( fd >= 0 ) {
-            ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
+            if (::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound ) == -1)
+                qWarning( "HTC::buzzer() - Couldn't make the buzzer buzz (%s)",
+			  strerror( errno ) );
             ::close ( fd );
         }
 
     }
 #endif
 }
 
 
diff --git a/libopie2/opiecore/device/odevice_zaurus.cpp b/libopie2/opiecore/device/odevice_zaurus.cpp
index 9d2ebbb..f978355 100644
--- a/libopie2/opiecore/device/odevice_zaurus.cpp
+++ b/libopie2/opiecore/device/odevice_zaurus.cpp
@@ -375,17 +375,19 @@ void Zaurus::buzzer( int sound )
     // device..
     if ( snd && snd->isFinished() ){
         changeMixerForAlarm( 0, "/dev/sound/mixer", snd );
         snd->play();
     } else if( !snd ) {
         int fd = ::open ( "/dev/sharp_buz", O_WRONLY|O_NONBLOCK );
 
         if ( fd >= 0 ) {
-            ::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound );
+            if (::ioctl ( fd, SHARP_BUZZER_MAKESOUND, sound ) == -1)
+                qWarning( "HTC::buzzer() - Couldn't make the buzzer buzz (%s)",
+			  strerror( errno ) );
             ::close ( fd );
         }
 
     }
 #endif
 }