suspend code now also calls sync() to flush fs caches (just like apm tool)

1 files changed, 4 insertions, 2 deletions

diff --git a/libopie/odevice.cpp b/libopie/odevice.cpp
index 1da8862..2f40731 100644
--- a/libopie/odevice.cpp
+++ b/libopie/odevice.cpp
@@ -117,78 +117,80 @@ ODevice::ODevice ( )
 }
 
 void ODevice::init ( )
 {
 }
 
 ODevice::~ODevice ( )
 {
         delete d;
 }
 
 //#include <linux/apm_bios.h>
 
 //#define APM_IOC_SUSPEND        _IO('A',2)
 
 #define APM_IOC_SUSPEND          (( 0<<30 ) | ( 'A'<<8 ) | ( 2 ) | ( 0<<16 ))
 
 bool ODevice::suspend ( )
 {
         if ( d-> m_model == OMODEL_Unknown ) // better don't suspend in qvfb / on unkown devices
                 return false;
 
         int fd;
         bool res = false;
         
         if ((( fd = ::open ( "/dev/apm_bios", O_RDWR )) >= 0 ) ||
                     (( fd = ::open ( "/dev/misc/apm_bios",O_RDWR )) >= 0 )) {
                 struct timeval tvs, tvn;
 
                         ::signal ( SIGTSTP, SIG_IGN );// we don't want to be stopped
                 ::gettimeofday ( &tvs, 0 );
         
+                ::sync ( ); // flush fs caches
+        
                 res = ( ::ioctl ( fd, APM_IOC_SUSPEND ) == 0 ); // tell the kernel to "start" suspending
-                ::close ( fd );
 
                         if ( res ) {
-                        ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in out process group
+                        ::kill ( -::getpid ( ), SIGTSTP ); // stop everthing in our process group
 
                         do { // wait at most 1.5 sec: either suspend didn't work or the device resumed
                                 ::usleep ( 200 * 1000 );
                                         ::gettimeofday ( &tvn, 0 );                     
                         } while ((( tvn. tv_sec - tvs. tv_sec ) * 1000 + ( tvn. tv_usec - tvs. tv_usec ) / 1000 ) < 1500 );
                         
                         ::kill ( -::getpid ( ), SIGCONT ); // continue everything in our process group
                         }
                 
+                        ::close ( fd );         
                 ::signal ( SIGTSTP, SIG_DFL );
         }
         
         return res;
 }
 
 
 QString ODevice::vendorString ( )
 {
         return d-> m_vendorstr;
 }
 
 OVendor ODevice::vendor ( )
 {
         return d-> m_vendor;
 }
 
 QString ODevice::modelString ( )
 {
         return d-> m_modelstr;
 }
 
 OModel ODevice::model ( )
 {
         return d-> m_model;
 }
 
 QString ODevice::systemString ( )
 {
         return d-> m_systemstr;
 }