Commit f39548a6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2b04be7e 417e1494

drivers/char/pcmcia/cm4000_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -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");

drivers/ide/legacy/ide-cs.c

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/pcmcia/cistpl.c

+1 −1
Original line number Diff line number Diff line
@@ -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;