diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 19:00:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-13 19:00:15 +0100 |
| commit | 0143832cc96d0bf78486297aad5c8fb2c2ead02a (patch) | |
| tree | 4aa5c06a58da4295a6053fb950e883fb33db82ae /drivers/char | |
| parent | Revert "8250: Fix tcsetattr to avoid ioctl(TIOCMIWAIT) hang" (diff) | |
| parent | drivers/pcmcia/soc_common.c: Use printf extension %pV (diff) | |
| download | linux-0143832cc96d0bf78486297aad5c8fb2c2ead02a.tar.xz linux-0143832cc96d0bf78486297aad5c8fb2c2ead02a.zip | |
Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6
* 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6:
drivers/pcmcia/soc_common.c: Use printf extension %pV
pcmcia: fix warning in synclink driver
pcmcia/sa1100: don't put machine specific init functions in .init.text
pcmcia/cm4000: fix error code
pd6729: Coding Style fixes
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index d962f25dcc2a..777181a2e603 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/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; } |