Merge git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-fixes-2.6 (c0f79c4c) · Commits · 戴 / test

drivers/net/wireless/hostap/hostap_cs.c

+7 −0

Original line number	Diff line number	Diff line
		@@ -887,6 +887,13 @@ static struct pcmcia_device_id hostap_cs_ids[] = {
		PCMCIA_DEVICE_PROD_ID123(
		"U.S. Robotics", "IEEE 802.11b PC-CARD", "Version 01.02",
		0xc7b8df9d, 0x1700d087, 0x4b74baa0),
		PCMCIA_DEVICE_PROD_ID123(
		"Allied Telesyn", "AT-WCL452 Wireless PCMCIA Radio",
		"Ver. 1.00",
		0x5cd01705, 0x4271660f, 0x9d08ee12),
		PCMCIA_DEVICE_PROD_ID123(
		"corega", "WL PCCL-11", "ISL37300P",
		0xa21501a, 0x59868926, 0xc9049a39),
		PCMCIA_DEVICE_NULL
		};
		MODULE_DEVICE_TABLE(pcmcia, hostap_cs_ids);

drivers/pcmcia/at91_cf.c

+9 −19

Original line number	Diff line number	Diff line
		@@ -241,12 +241,6 @@ static int __init at91_cf_probe(struct platform_device *pdev)
		csa = at91_sys_read(AT91_EBI_CSA);
		at91_sys_write(AT91_EBI_CSA, csa \| AT91_EBI_CS4A_SMC_COMPACTFLASH);

		/* force poweron defaults for these pins ... */
		(void) at91_set_A_periph(AT91_PIN_PC9, 0); /* A25/CFRNW */
		(void) at91_set_A_periph(AT91_PIN_PC10, 0); /* NCS4/CFCS */
		(void) at91_set_A_periph(AT91_PIN_PC11, 0); /* NCS5/CFCE1 */
		(void) at91_set_A_periph(AT91_PIN_PC12, 0); /* NCS6/CFCE2 */

		/* nWAIT is _not_ a default setting */
		(void) at91_set_A_periph(AT91_PIN_PC6, 1); /* nWAIT */

		@@ -316,12 +310,14 @@ static int __init at91_cf_probe(struct platform_device *pdev)
		return 0;

		fail2:
		iounmap((void __iomem *) cf->socket.io_offset);
		release_mem_region(io->start, io->end + 1 - io->start);
		fail1:
		if (cf->socket.io_offset)
		iounmap((void __iomem *) cf->socket.io_offset);
		if (board->irq_pin)
		free_irq(board->irq_pin, cf);
		fail0a:
		device_init_wakeup(&pdev->dev, 0);
		free_irq(board->det_pin, cf);
		device_init_wakeup(&pdev->dev, 0);
		fail0:
		@@ -360,26 +356,20 @@ static int at91_cf_suspend(struct platform_device *pdev, pm_message_t mesg)
		struct at91_cf_data *board = cf->board;

		pcmcia_socket_dev_suspend(&pdev->dev, mesg);
		if (device_may_wakeup(&pdev->dev))
		if (device_may_wakeup(&pdev->dev)) {
		enable_irq_wake(board->det_pin);
		else {
		if (board->irq_pin)
		enable_irq_wake(board->irq_pin);
		} else {
		disable_irq_wake(board->det_pin);
		disable_irq(board->det_pin);
		}
		if (board->irq_pin)
		disable_irq(board->irq_pin);
		disable_irq_wake(board->irq_pin);
		}
		return 0;
		}

		static int at91_cf_resume(struct platform_device *pdev)
		{
		struct at91_cf_socket *cf = platform_get_drvdata(pdev);
		struct at91_cf_data *board = cf->board;

		if (board->irq_pin)
		enable_irq(board->irq_pin);
		if (!device_may_wakeup(&pdev->dev))
		enable_irq(board->det_pin);
		pcmcia_socket_dev_resume(&pdev->dev);
		return 0;
		}

drivers/pcmcia/au1000_generic.c

+19 −6

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ struct skt_dev_info {
		int au1x00_pcmcia_socket_probe(struct device dev, struct pcmcia_low_level ops, int first, int nr)
		{
		struct skt_dev_info *sinfo;
		struct au1000_pcmcia_socket *skt;
		int ret, i;

		sinfo = kzalloc(sizeof(struct skt_dev_info), GFP_KERNEL);
		@@ -365,7 +366,7 @@ int au1x00_pcmcia_socket_probe(struct device dev, struct pcmcia_low_level ops,
		* Initialise the per-socket structure.
		*/
		for (i = 0; i < nr; i++) {
		struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);
		skt = PCMCIA_SOCKET(i);
		memset(skt, 0, sizeof(*skt));

		skt->socket.resource_ops = &pccard_static_ops;
		@@ -438,17 +439,29 @@ int au1x00_pcmcia_socket_probe(struct device dev, struct pcmcia_low_level ops,
		dev_set_drvdata(dev, sinfo);
		return 0;

		do {
		struct au1000_pcmcia_socket *skt = PCMCIA_SOCKET(i);

		out_err:
		flush_scheduled_work();
		ops->hw_shutdown(skt);
		while (i-- > 0) {
		skt = PCMCIA_SOCKET(i);

		del_timer_sync(&skt->poll_timer);
		pcmcia_unregister_socket(&skt->socket);
		out_err:
		flush_scheduled_work();
		if (i == 0) {
		iounmap(skt->virt_io + (u32)mips_io_port_base);
		skt->virt_io = NULL;
		}
		#ifndef CONFIG_MIPS_XXS1500
		else {
		iounmap(skt->virt_io + (u32)mips_io_port_base);
		skt->virt_io = NULL;
		}
		#endif
		ops->hw_shutdown(skt);

		i--;
		} while (i > 0);
		}
		kfree(sinfo);
		out:
		return ret;

drivers/pcmcia/ds.c

+24 −5

Original line number	Diff line number	Diff line
		@@ -717,6 +717,7 @@ static int pcmcia_requery(struct device dev, void _data)
		static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
		{
		int no_devices=0;
		int ret = 0;
		unsigned long flags;

		/* must be called with skt_mutex held */
		@@ -729,7 +730,7 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)
		* missing resource information or other trouble, we need to
		* do this now. */
		if (no_devices) {
		int ret = pcmcia_card_add(skt);
		ret = pcmcia_card_add(skt);
		if (ret)
		return;
		}
		@@ -741,7 +742,9 @@ static void pcmcia_bus_rescan(struct pcmcia_socket *skt)

		/* we re-scan all devices, not just the ones connected to this
		* socket. This does not matter, though. */
		bus_rescan_devices(&pcmcia_bus_type);
		ret = bus_rescan_devices(&pcmcia_bus_type);
		if (ret)
		printk(KERN_INFO "pcmcia: bus_rescan_devices failed\n");
		}

		static inline int pcmcia_devmatch(struct pcmcia_device *dev,
		@@ -1001,6 +1004,7 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
		struct device_attribute attr, const char buf, size_t count)
		{
		struct pcmcia_device *p_dev = to_pcmcia_dev(dev);
		int ret;

		if (!count)
		return -EINVAL;
		@@ -1009,7 +1013,10 @@ static ssize_t pcmcia_store_allow_func_id_match(struct device *dev,
		p_dev->allow_func_id_match = 1;
		mutex_unlock(&p_dev->socket->skt_mutex);

		bus_rescan_devices(&pcmcia_bus_type);
		ret = bus_rescan_devices(&pcmcia_bus_type);
		if (ret)
		printk(KERN_INFO "pcmcia: bus_rescan_devices failed after "
		"allowing func_id matches\n");

		return count;
		}
		@@ -1292,10 +1299,22 @@ struct bus_type pcmcia_bus_type = {

		static int __init init_pcmcia_bus(void)
		{
		int ret;

		spin_lock_init(&pcmcia_dev_list_lock);

		bus_register(&pcmcia_bus_type);
		class_interface_register(&pcmcia_bus_interface);
		ret = bus_register(&pcmcia_bus_type);
		if (ret < 0) {
		printk(KERN_WARNING "pcmcia: bus_register error: %d\n", ret);
		return ret;
		}
		ret = class_interface_register(&pcmcia_bus_interface);
		if (ret < 0) {
		printk(KERN_WARNING
		"pcmcia: class_interface_register error: %d\n", ret);
		bus_unregister(&pcmcia_bus_type);
		return ret;
		}

		pcmcia_setup_ioctl();

drivers/pcmcia/i82092.c

+5 −4

Original line number	Diff line number	Diff line
		@@ -41,6 +41,7 @@ static struct pci_device_id i82092aa_pci_ids[] = {
		};
		MODULE_DEVICE_TABLE(pci, i82092aa_pci_ids);

		#ifdef CONFIG_PM
		static int i82092aa_socket_suspend (struct pci_dev *dev, pm_message_t state)
		{
		return pcmcia_socket_dev_suspend(&dev->dev, state);
		@@ -50,14 +51,17 @@ static int i82092aa_socket_resume (struct pci_dev *dev)
		{
		return pcmcia_socket_dev_resume(&dev->dev);
		}
		#endif

		static struct pci_driver i82092aa_pci_drv = {
		.name = "i82092aa",
		.id_table = i82092aa_pci_ids,
		.probe = i82092aa_pci_probe,
		.remove = __devexit_p(i82092aa_pci_remove),
		#ifdef CONFIG_PM
		.suspend = i82092aa_socket_suspend,
		.resume = i82092aa_socket_resume,
		#endif
		};


		@@ -705,10 +709,7 @@ static int i82092aa_set_mem_map(struct pcmcia_socket *socket, struct pccard_mem_

		static int i82092aa_module_init(void)
		{
		enter("i82092aa_module_init");
		pci_register_driver(&i82092aa_pci_drv);
		leave("i82092aa_module_init");
		return 0;
		return pci_register_driver(&i82092aa_pci_drv);
		}

		static void i82092aa_module_exit(void)

Admin message