From 1b2328d790f3ff856428b5ce3599a7c08b9ceaf0 Mon Sep 17 00:00:00 2001
From: Nicolas Kaiser <nikai@nikai.net>
Date: Fri, 22 Oct 2010 18:10:24 +0200
Subject: [PATCH] --- yaml --- r: 222077 b: refs/heads/master c:
 20fffee818ec43b64f58ab25c42705b7dcae16e5 h: refs/heads/master i:   222075:
 cd258ce4d8d71f0564f5f51187a20c79d1b6fa60 v: v3

---
 [refs]                                | 2 +-
 trunk/drivers/char/pcmcia/cm4000_cs.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index eeb7a731401c..1464bd4e2bc0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 006839f12e9dc484a6227b263843f987abb709a4
+refs/heads/master: 20fffee818ec43b64f58ab25c42705b7dcae16e5
diff --git a/trunk/drivers/char/pcmcia/cm4000_cs.c b/trunk/drivers/char/pcmcia/cm4000_cs.c
index d962f25dcc2a..777181a2e603 100644
--- a/trunk/drivers/char/pcmcia/cm4000_cs.c
+++ b/trunk/drivers/char/pcmcia/cm4000_cs.c
@@ -979,8 +979,9 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
 		if (dev->flags0 & 1) {
 			set_bit(IS_CMM_ABSENT, &dev->flags);
 			rc = -ENODEV;
+		} else {
+			rc = -EIO;
 		}
-		rc = -EIO;
 		goto release_io;
 	}