--- zzzz-none-000/linux-2.6.19.2/drivers/pcmcia/pcmcia_ioctl.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/drivers/pcmcia/pcmcia_ioctl.c	2007-01-11 07:38:19.000000000 +0000
@@ -128,12 +128,9 @@
 			     int count, int *eof, void *data)
 {
 	char *p = buf;
-	int rc;
 
-	rc = bus_for_each_drv(&pcmcia_bus_type, NULL,
-			      (void *) &p, proc_read_drivers_callback);
-	if (rc < 0)
-		return rc;
+	bus_for_each_drv(&pcmcia_bus_type, NULL,
+			 (void *) &p, proc_read_drivers_callback);
 
 	return (p - buf);
 }
@@ -272,10 +269,8 @@
 	 * Prevent this racing with a card insertion.
 	 */
 	mutex_lock(&s->skt_mutex);
-	ret = bus_rescan_devices(&pcmcia_bus_type);
+	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