2 files changed, 11 insertions, 10 deletions

diff --git a/libopie2/opiecore/linux/opcmciasystem.cpp b/libopie2/opiecore/linux/opcmciasystem.cpp
index 2eece6b..054d261 100644
--- a/libopie2/opiecore/linux/opcmciasystem.cpp
+++ b/libopie2/opiecore/linux/opcmciasystem.cpp
@@ -51,3 +51,3 @@ using namespace Opie::Core;
 
-#define OPCMCIA_DEBUG 1
+// #define OPCMCIA_DEBUG 1
 
@@ -307,3 +307,3 @@ bool OPcmciaSocket::eject()
 {
-    return ::ioctl( _fd, DS_EJECT_CARD );
+    return ::ioctl( _fd, DS_EJECT_CARD ) != -1;
 }
@@ -313,3 +313,3 @@ bool OPcmciaSocket::insert()
 {
-    return ::ioctl( _fd, DS_INSERT_CARD );
+    return ::ioctl( _fd, DS_INSERT_CARD ) != -1;
 }
@@ -319,3 +319,3 @@ bool OPcmciaSocket::suspend()
 {
-    return ::ioctl( _fd, DS_SUSPEND_CARD );
+    return ::ioctl( _fd, DS_SUSPEND_CARD ) != -1;
 }
@@ -325,3 +325,3 @@ bool OPcmciaSocket::resume()
 {
-    return ::ioctl( _fd, DS_RESUME_CARD );
+    return ::ioctl( _fd, DS_RESUME_CARD ) != -1;
 }
@@ -331,3 +331,3 @@ bool OPcmciaSocket::reset()
 {
-    return ::ioctl( _fd, DS_RESET_CARD );
+    return ::ioctl( _fd, DS_RESET_CARD ) != -1;
 }
diff --git a/noncore/applets/pcmcia/pcmcia.cpp b/noncore/applets/pcmcia/pcmcia.cpp
index aea699f..99c1bc9 100644
--- a/noncore/applets/pcmcia/pcmcia.cpp
+++ b/noncore/applets/pcmcia/pcmcia.cpp
@@ -59,2 +59,3 @@ using namespace Opie::Ui;
 #include <string.h>
+#include <errno.h>
 #include <fcntl.h>
@@ -138,4 +139,4 @@ void PcmciaManager::mousePressEvent( QMouseEvent* )
         submenu->setItemEnabled( INSERT+i*100, it.current()->isEmpty() );
-        submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
-        submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
+        submenu->setItemEnabled( SUSPEND+i*100, !it.current()->isEmpty() && it.current()->isSuspended() );
+        submenu->setItemEnabled( RESUME+i*100, !it.current()->isEmpty() && !it.current()->isSuspended() );
         submenu->setItemEnabled( CONFIGURE+i*100, !it.current()->isEmpty() && !configuring );
@@ -261,3 +262,3 @@ void PcmciaManager::userCardAction( int action )
 {
-    odebug << "user action requested. action = " << action << oendl;
+    odebug << "user action on socket " << action / 100 << " requested. action = " << action << oendl;
 
@@ -280,3 +281,3 @@ void PcmciaManager::userCardAction( int action )
     {
-        owarn << "couldn't perform user action" << oendl;
+        owarn << "couldn't perform user action (" << strerror( errno ) << ")" << oendl;
     }