From 2695f72652956e94e24611539579e7ff7899811e Mon Sep 17 00:00:00 2001
From: erik <erik>
Date: Fri, 09 Feb 2007 21:12:35 +0000
Subject: This commit fixes an issue where an ioctl call is made but the return

value is not checked. It isn't a big deal. But it would be nice if the
user knew that an ioctl to a device tanked.
---
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
@@ -66,6 +66,7 @@
 #include <unistd.h>
 #ifndef QT_NO_SOUND
 #include <linux/soundcard.h>
+#include <errno.h>
 #endif
 
 namespace Opie {
@@ -749,6 +750,8 @@ void ODevice::remPreHandler(QWSServer::KeyboardFilter*aFilter)
 /**
  * @internal
  *
+ * Returns the volume back to the user preference after an alarm is finished.
+ *
  * @see changeMixerForAlarm
  */
 void ODevice::playingStopped() {
@@ -757,7 +760,9 @@ void ODevice::playingStopped() {
 
 #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
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
@@ -306,7 +306,9 @@ void HTC::buzzer( int sound )
         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 );
         }
 
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
@@ -380,7 +380,9 @@ void Zaurus::buzzer( int sound )
         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 );
         }
 
--
cgit v0.9.0.2