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
@@ -184,5 +184,5 @@ bool Palm::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
                 break;
         }
-    
+
         if (newkeycode!=keycode) {
             if ( newkeycode != Key_unknown ) {
@@ -193,5 +193,5 @@ bool Palm::filter ( int /*unicode*/, int keycode, int modifiers, bool isPress, b
 
     }
-  
+
     return false;
 }
@@ -230,4 +230,5 @@ int Palm::displayBrightnessResolution() const
 {
     int res = 1;
+    int fd = -1;
 
     switch ( d->m_model )
@@ -236,9 +237,10 @@ int Palm::displayBrightnessResolution() const
       case Model_Palm_TX:
       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 );
         }
@@ -248,5 +250,5 @@ int Palm::displayBrightnessResolution() const
         res = 1;
     }
- 
+
     return res;
 }
@@ -262,4 +264,5 @@ bool Palm::setDisplayBrightness( int bright )
     int numberOfSteps = displayBrightnessResolution();
     int val = ( bright == 1 ) ? 1 : ( bright * numberOfSteps ) / 255;
+    int fd = -1;
 
     switch ( d->m_model )
@@ -269,6 +272,6 @@ bool Palm::setDisplayBrightness( int bright )
       case Model_Palm_TX:
       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 )
         {
             char buf[100];
@@ -278,6 +281,7 @@ bool Palm::setDisplayBrightness( int bright )
         }
         break;
-      
-      default: res = false;
+
+      default:
+        res = false;
     }
     return res;