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

torvalds · torvalds · commit f39548a6ad1d · 2008-07-17T10:55:07.000-07:00
* 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
diff --git 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");
diff --git a/drivers/ide/legacy/ide-cs.c b/drivers/ide/legacy/ide-cs.c
@@ -66,8 +66,6 @@ MODULE_LICENSE("Dual MPL/GPL");
 #ifdef CONFIG_PCMCIA_DEBUG
 INT_MODULE_PARM(pc_debug, 0);
 #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
 #define DEBUG(n, args...)
 #endif
diff --git a/drivers/pcmcia/cistpl.c b/drivers/pcmcia/cistpl.c
@@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned
 	    ((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))
 	    reserved++;
     }
-    if ((count) || (reserved > 5) ||
+    if ((count == MAX_TUPLES) || (reserved > 5) ||
 	((!dev_ok || !ident_ok) && (count > 10)))
 	count = 0;
 

Original file line number	Diff line number	Diff line change
`@@ -1439,7 +1439,7 @@ static long cmm_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)`
`1439`	`1439`	`DEBUGP(4, dev, "CMM_ABSENT flag set\n");`
`1440`	`1440`	`goto out;`
`1441`	`1441`	`}`
`1442`		`- rc = EINVAL;`
	`1442`	`+ rc = -EINVAL;`
`1443`	`1443`
`1444`	`1444`	`if (_IOC_TYPE(cmd) != CM_IOC_MAGIC) {`
`1445`	`1445`	`DEBUGP(4, dev, "ioctype mismatch\n");`
Original file line number	Diff line number	Diff line change
`@@ -1490,7 +1490,7 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int function, unsigned`
`1490`	`1490`	`((tuple->TupleCode > 0x90) && (tuple->TupleCode < 0xff)))`
`1491`	`1491`	`reserved++;`
`1492`	`1492`	`}`
`1493`		`- if ((count) \|\| (reserved > 5) \|\|`
	`1493`	`+ if ((count == MAX_TUPLES) \|\| (reserved > 5) \|\|`
`1494`	`1494`	`((!dev_ok \|\| !ident_ok) && (count > 10)))`
`1495`	`1495`	`count = 0;`
`1496`	`1496`