1 files changed, 14 insertions, 10 deletions

diff --git a/libopie2/opiecore/device/odevice_palm.cpp b/libopie2/opiecore/device/odevice_palm.cpp
index 399c08c..d40dfce 100644
--- a/libopie2/opiecore/device/odevice_palm.cpp
+++ b/libopie2/opiecore/device/odevice_palm.cpp
@@ -185,3 +185,3 @@ bool Palm::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
         }
-    
+
         if (newkeycode!=keycode) {
@@ -194,3 +194,3 @@ bool Palm::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
     }
-  
+
     return false;
@@ -231,2 +231,3 @@ int Palm::displayBrightnessResolution() const
     int res = 1;
+    int fd = -1;
 
@@ -237,7 +238,8 @@ int Palm::displayBrightnessResolution() const
       case Model_Palm_Z72:
-        int fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK );
-        if ( fd )
+        fd = ::open( m_backlightdev + "max_brightness", O_RDONLY|O_NONBLOCK );
+        if ( fd != -1)
         {
           char buf[100];
-          if ( ::read( fd, &buf[0], sizeof buf ) ) ::sscanf( &buf[0], "%d", &res );
+          if ( ::read( fd, &buf[0], sizeof buf ) > 0 )
+              ::sscanf( &buf[0], "%d", &res );
           ::close( fd );
@@ -249,3 +251,3 @@ int Palm::displayBrightnessResolution() const
     }
- 
+
     return res;
@@ -263,2 +265,3 @@ bool Palm::setDisplayBrightness( int bright )
     int val = ( bright == 1 ) ? 1 : ( bright * numberOfSteps ) / 255;
+    int fd = -1;
 
@@ -270,4 +273,4 @@ bool Palm::setDisplayBrightness( int bright )
       case Model_Palm_Z72:
-        int fd = ::open( m_backlightdev + "brightness", O_WRONLY|O_NONBLOCK );
-        if ( fd )
+        fd = ::open( m_backlightdev + "brightness", O_WRONLY|O_NONBLOCK );
+        if ( fd  != -1 )
         {
@@ -279,4 +282,5 @@ bool Palm::setDisplayBrightness( int bright )
         break;
-      
-      default: res = false;
+
+      default:
+        res = false;
     }