diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 10:55:07 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-17 10:55:07 -0700 |
| commit | f39548a6ad1dbdfaab552419386ec5bb1d76fa0d (patch) | |
| tree | c8fd3a1af39749e7cd8bb1e3a1c2a167a3f66f49 /drivers/char | |
| parent | 2b04be7e8ab5756ea36e137dd03c8773d184e67e (diff) | |
| parent | 417e1494fd70715b737428cc3c3d924255f22ba1 (diff) | |
| download | kernel_samsung_smdk4412-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.zip kernel_samsung_smdk4412-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.tar.gz kernel_samsung_smdk4412-f39548a6ad1dbdfaab552419386ec5bb1d76fa0d.tar.bz2 | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6:
pcmcia: ide-cs: Remove outdated comment
pcmcia: fix cisinfo_t removal
pcmcia: fix return value in cm4000_cs.c
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/pcmcia/cm4000_cs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pcmcia/cm4000_cs.c b/drivers/char/pcmcia/cm4000_cs.c index 59ca351..e4a4fbd 100644 --- a/drivers/char/pcmcia/cm4000_cs.c +++ b/drivers/char/pcmcia/cm4000_cs.c @@ -1439,7 +1439,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) DEBUGP(4, dev, "CMM_ABSENT flag set\n"); goto out; } - rc = EINVAL; + rc = -EINVAL; if (_IOC_TYPE(cmd) != CM_IOC_MAGIC) { DEBUGP(4, dev, "ioctype mismatch\n"); |