aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pcmcia
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/pcmcia')
-rw-r--r--drivers/pcmcia/ds.c16
1 files changed, 14 insertions, 2 deletions
diff --git a/drivers/pcmcia/ds.c b/drivers/pcmcia/ds.c
index 74b3124e8247..af392bfee5a6 100644
--- a/drivers/pcmcia/ds.c
+++ b/drivers/pcmcia/ds.c
@@ -1292,10 +1292,22 @@ struct bus_type pcmcia_bus_type = {
1292 1292
1293static int __init init_pcmcia_bus(void) 1293static int __init init_pcmcia_bus(void)
1294{ 1294{
1295 int ret;
1296
1295 spin_lock_init(&pcmcia_dev_list_lock); 1297 spin_lock_init(&pcmcia_dev_list_lock);
1296 1298
1297 bus_register(&pcmcia_bus_type); 1299 ret = bus_register(&pcmcia_bus_type);
1298 class_interface_register(&pcmcia_bus_interface); 1300 if (ret < 0) {
1301 printk(KERN_WARNING "pcmcia: bus_register error: %d\n", ret);
1302 return ret;
1303 }
1304 ret = class_interface_register(&pcmcia_bus_interface);
1305 if (ret < 0) {
1306 printk(KERN_WARNING
1307 "pcmcia: class_interface_register error: %d\n", ret);
1308 bus_unregister(&pcmcia_bus_type);
1309 return ret;
1310 }
1299 1311
1300 pcmcia_setup_ioctl(); 1312 pcmcia_setup_ioctl();
1301 1313