Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27ee8963 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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:
  pcmcia: fix error handling in cm4000_cs.c
  drivers/pcmcia: Add missing local_irq_restore
  serial_cs: MD55x support (PCMCIA GPRS/EDGE modem) (kernel 2.6.33)
  pcmcia: avoid late calls to pccard_validate_cis
  pcmcia: fix ioport size calculation in rsrc_nonstatic
  pcmcia: re-start on MFC override
  pcmcia: fix io_probe due to parent (PCI) resources
  pcmcia: use previously assigned IRQ for all card functions
parents ac8bf564 07a71415

drivers/char/pcmcia/cm4000_cs.c

+5 −3
Original line number Diff line number Diff line
@@ -1026,14 +1026,16 @@ static ssize_t cmm_read(struct file *filp, __user char *buf, size_t count, 


	xoutb(0, REG_FLAGS1(iobase));	/* clear detectCMM */

	/* last check before exit */

	if (!io_detect_cm4000(iobase, dev))

		count = -ENODEV;

	if (!io_detect_cm4000(iobase, dev)) {

		rc = -ENODEV;

		goto release_io;

	}



	if (test_bit(IS_INVREV, &dev->flags) && count > 0)

		str_invert_revert(dev->rbuf, count);



	if (copy_to_user(buf, dev->rbuf, count))

		return -EFAULT;

		rc = -EFAULT;



release_io:

	clear_bit(LOCK_IO, &dev->flags);

drivers/pcmcia/cistpl.c

+7 −2
Original line number Diff line number Diff line
@@ -1484,6 +1484,11 @@ int pccard_validate_cis(struct pcmcia_socket *s, unsigned int *info) 
	if (!s)

		return -EINVAL;



	if (s->functions) {

		WARN_ON(1);

		return -EINVAL;

	}



	/* We do not want to validate the CIS cache... */

	mutex_lock(&s->ops_mutex);

	destroy_cis_cache(s);
@@ -1639,7 +1644,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, 
		count = 0;

	else {

		struct pcmcia_socket *s;

		unsigned int chains;

		unsigned int chains = 1;



		if (off + count > size)

			count = size - off;
@@ -1648,7 +1653,7 @@ static ssize_t pccard_show_cis(struct kobject *kobj, 


		if (!(s->state & SOCKET_PRESENT))

			return -ENODEV;

		if (pccard_validate_cis(s, &chains))

		if (!s->functions && pccard_validate_cis(s, &chains))

			return -EIO;

		if (!chains)

			return -ENODATA;

drivers/pcmcia/db1xxx_ss.c

+3 −1
Original line number Diff line number Diff line
@@ -166,8 +166,10 @@ static int db1x_pcmcia_setup_irqs(struct db1x_pcmcia_sock *sock) 


		ret = request_irq(sock->insert_irq, db1200_pcmcia_cdirq,

				  IRQF_DISABLED, "pcmcia_insert", sock);

		if (ret)

		if (ret) {

			local_irq_restore(flags);

			goto out1;

		}



		ret = request_irq(sock->eject_irq, db1200_pcmcia_cdirq,

				  IRQF_DISABLED, "pcmcia_eject", sock);

drivers/pcmcia/ds.c

+14 −8
Original line number Diff line number Diff line
@@ -687,12 +687,10 @@ static void pcmcia_requery(struct pcmcia_socket *s) 
			new_funcs = mfc.nfn;

		else

			new_funcs = 1;

		if (old_funcs > new_funcs) {

		if (old_funcs != new_funcs) {

			/* we need to re-start */

			pcmcia_card_remove(s, NULL);

			pcmcia_card_add(s);

		} else if (new_funcs > old_funcs) {

			s->functions = new_funcs;

			pcmcia_device_add(s, 1);

		}

	}
@@ -728,6 +726,8 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 
	struct pcmcia_socket *s = dev->socket;

	const struct firmware *fw;

	int ret = -ENOMEM;

	cistpl_longlink_mfc_t mfc;

	int old_funcs, new_funcs = 1;



	if (!filename)

		return -EINVAL;
@@ -750,6 +750,14 @@ static int pcmcia_load_firmware(struct pcmcia_device *dev, char * filename) 
			goto release;

		}



		/* we need to re-start if the number of functions changed */

		old_funcs = s->functions;

		if (!pccard_read_tuple(s, BIND_FN_ALL, CISTPL_LONGLINK_MFC,

					&mfc))

			new_funcs = mfc.nfn;



		if (old_funcs != new_funcs)

			ret = -EBUSY;



		/* update information */

		pcmcia_device_query(dev);
@@ -858,9 +866,7 @@ static inline int pcmcia_devmatch(struct pcmcia_device *dev, 
	if (did->match_flags & PCMCIA_DEV_ID_MATCH_FAKE_CIS) {

		dev_dbg(&dev->dev, "device needs a fake CIS\n");

		if (!dev->socket->fake_cis)

			pcmcia_load_firmware(dev, did->cisfile);



		if (!dev->socket->fake_cis)

			if (pcmcia_load_firmware(dev, did->cisfile))

				return 0;

	}

drivers/pcmcia/pcmcia_resource.c

+5 −5
Original line number Diff line number Diff line
@@ -755,12 +755,12 @@ int pcmcia_request_irq(struct pcmcia_device *p_dev, irq_req_t *req) 
	else

		printk(KERN_WARNING "pcmcia: Driver needs updating to support IRQ sharing.\n");



#ifdef CONFIG_PCMCIA_PROBE



	if (s->irq.AssignedIRQ != 0) {

	/* If the interrupt is already assigned, it must be the same */

	if (s->irq.AssignedIRQ != 0)

		irq = s->irq.AssignedIRQ;

	} else {



#ifdef CONFIG_PCMCIA_PROBE

	if (!irq) {

		int try;

		u32 mask = s->irq_mask;

		void *data = p_dev; /* something unique to this device */