summaryrefslogtreecommitdiffstats
path: root/drivers/char/pcmcia
diff options
context:
space:
mode:
authorDan Carpenter <error27@gmail.com>2010-04-18 22:07:33 +0300
committerDominik Brodowski <linux@dominikbrodowski.net>2010-04-19 16:04:13 +0200
commit07a71415d5f790385695784a9b0e554412ee95c3 (patch)
treeb9ce527d511d0f1b50c8b532e484c8bec751a316 /drivers/char/pcmcia
parent42d284b986105a6ed5ac386818cae093532b2c55 (diff)
downloadop-kernel-dev-07a71415d5f790385695784a9b0e554412ee95c3.zip
op-kernel-dev-07a71415d5f790385695784a9b0e554412ee95c3.tar.gz
pcmcia: fix error handling in cm4000_cs.c
In the original code we used -ENODEV as the number of bytes to copy_to_user() and we didn't release the locks. Signed-off-by: Dan Carpenter <error27@gmail.com> Acked-by: Harald Welte <laforge@gnumonks.org> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/char/pcmcia')
-rw-r--r--drivers/char/pcmcia/cm4000_cs.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c
index c9bc896..90b199f 100644
--- a/drivers/char/pcmcia/cm4000_cs.c
+++ b/drivers/char/pcmcia/cm4000_cs.c
@@ -1026,14 +1026,16 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count,
xoutb(0, REG_FLAGS1(iobase)); /* clear detectCMM */
/* last check before exit */
- if (!io_detect_cm4000(iobase, dev))
- count = -ENODEV;
+ if (!io_detect_cm4000(iobase, dev)) {
+ rc = -ENODEV;
+ goto release_io;
+ }
if (test_bit(IS_INVREV, &dev->flags) && count > 0)
str_invert_revert(dev->rbuf, count);
if (copy_to_user(buf, dev->rbuf, count))
- return -EFAULT;
+ rc = -EFAULT;
release_io:
clear_bit(LOCK_IO, &dev->flags);
OpenPOWER on IntegriCloud