PCMCIA: handle sysfs, PCI errors
PATCH 1/1 PCMCIA: handle sysfs, PCI errors
Signed-off-by Jeff Garzik <[email protected]>
---
drivers/pcmcia/ds.c | 16 ++++++++++++++-- drivers/pcmcia/i82092.c | 7 +++++-- drivers/pcmcia/pcmcia_ioctl.c | 11 ++++++++--- drivers/pcmcia/yenta_socket.c | 16 +++++++++++++---
drivers/pcmcia/ds.c +14 -2
@@ -1292,14 +1292,26 @@ struct bus_type pcmcia_bus_type = {static int __init init_pcmcia_bus (void ) { +int rc; +spin_lock_init (&pcmcia_dev_list_lock); -bus_register (&pcmcia_bus_type); -class_interface_register (&pcmcia_bus_interface); + rc =bus_register (&pcmcia_bus_type); +if (rc) + goto err; + + rc =class_interface_register (&pcmcia_bus_interface); +if (rc) + goto err_bus;pcmcia_setup_ioctl ();return 0 ; + +err_bus: +bus_unregister (&pcmcia_bus_type); +err: +return rc; }fs_initcall (init_pcmcia_bus);/* one level after subsys_initcall so that * pcmcia_socket_class is already registered */
drivers/pcmcia/i82092.c +5 -2
@@ -705,10 +705,13 @@ static int i82092aa_set_mem_map(struct pstatic int i82092aa_module_init (void ) { +int rc; +enter ("i82092aa_module_init" ); -pci_register_driver (&i82092aa_pci_drv); + rc =pci_register_driver (&i82092aa_pci_drv);leave ("i82092aa_module_init" ); -return 0 ; + +return rc; }static void i82092aa_module_exit (void )
drivers/pcmcia/pcmcia_ioctl.c +8 -3
@@ -128,9 +128,12 @@ static int proc_read_drivers(char *buf, int count, int *eof, void *data) { char *p = buf; +int rc; -bus_for_each_drv (&pcmcia_bus_type,NULL , - (void *) &p, proc_read_drivers_callback); + rc =bus_for_each_drv (&pcmcia_bus_type,NULL , + (void *) &p, proc_read_drivers_callback); +if (rc <0 ) +return rc;return (p - buf); }
@@ -269,8 +272,10 @@ rescan:* Prevent this racing with a card insertion. */ mutex_lock (&s->skt_mutex); -bus_rescan_devices (&pcmcia_bus_type); + ret =bus_rescan_devices (&pcmcia_bus_type);mutex_unlock (&s->skt_mutex); +if (ret) + goto err_put_module;/* check whether the driver indeed matched. I don't care if this * is racy or not, because it can only happen on cardmgr access
drivers/pcmcia/yenta_socket.c +13 -3
@@ -1197,8 +1197,12 @@ static int __devinit yenta_probe (struct ret =pcmcia_register_socket (&socket->socket);if (ret ==0 ) {/* Add the yenta register attributes */ -device_create_file (&dev->dev, &dev_attr_yenta_registers); - goto out; + ret =device_create_file (&dev->dev, &dev_attr_yenta_registers); +if (ret ==0 ) + goto out; + +/* error path... */ +pcmcia_unregister_socket (&socket->socket); } unmap:
@@ -1248,12 +1252,18 @@ static int yenta_dev_resume (struct pci_struct yenta_socket *socket =pci_get_drvdata (dev);if (socket) { +int rc; +pci_set_power_state (dev,0 );/* FIXME: pci_restore_state needs to have a better interface */ pci_restore_state (dev);pci_write_config_dword (dev,16 *4 , socket->saved_state[0 ]);pci_write_config_dword (dev,17 *4 , socket->saved_state[1 ]); -pci_enable_device (dev); + + rc =pci_enable_device (dev); +if (rc) +return rc; +pci_set_master (dev);if (socket->type && socket->type->restore_state)
Some of these were already fixed in pcmcia-ds-must_check-fixes.patch and i82092-wire-up-errors-from-pci_register_driver.patch:
static int __init init_pcmcia_bus(void)
{
int ret;
spin_lock_init(&pcmcia_dev_list_lock);
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();
return 0;
}and
static int i82092aa_module_init(void)
{
return pci_register_driver(&i82092aa_pci_drv);
}I queued the rest for Dominik-spamming.