FEX-Emu/linux
1
0
Fork 0
mirror of https://github.com/FEX-Emu/linux.git synced 2024-12-15 05:11:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6

Browse Source 
* 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
This commit is contained in:
Linus Torvalds 2008-07-17 10:55:07 -07:00
commit f39548a6ad
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/char/pcmcia/cm4000_cs.c
View File

@ -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"); DEBUGP(4, dev, "CMM_ABSENT flag set\n");
goto out; goto out;
} }
rc = EINVAL; rc = -EINVAL;
if (_IOC_TYPE(cmd) != CM_IOC_MAGIC) { if (_IOC_TYPE(cmd) != CM_IOC_MAGIC) {
DEBUGP(4, dev, "ioctype mismatch\n"); DEBUGP(4, dev, "ioctype mismatch\n");

2
drivers/ide/legacy/ide-cs.c
View File

@ -66,8 +66,6 @@ MODULE_LICENSE("Dual MPL/GPL");
#ifdef CONFIG_PCMCIA_DEBUG #ifdef CONFIG_PCMCIA_DEBUG
INT_MODULE_PARM(pc_debug, 0); INT_MODULE_PARM(pc_debug, 0);
#define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args) #define DEBUG(n, args...) if (pc_debug>(n)) printk(KERN_DEBUG args)
/*static char *version =
"ide-cs.c 1.3 2002/10/26 05:45:31 (David Hinds)";*/
#else #else
#define DEBUG(n, args...) #define DEBUG(n, args...)
#endif #endif

2
drivers/pcmcia/cistpl.c
View File

@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff))) ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
reserved++; reserved++;
} }
if ((count) || (reserved > 5) || if ((count == MAX_TUPLES) || (reserved > 5) ||
((!dev_ok || !ident_ok) && (count > 10))) ((!dev_ok || !ident_ok) && (count > 10)))
count = 0; count = 0;