X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=drivers%2Fpnp%2Fcard.c;h=b68eef251614c68a55ecadd069f7e76e45ff20cf;hb=0cbcb4d39a83d4df7e45c13b5ebd9fe73e025237;hp=aaa568a3806ea9e35873803f646989c9a3487a53;hpb=3cfc15103aa56c2c7ee6dd312c24a8d1697bade1;p=powerpc.git

diff --git a/drivers/pnp/card.c b/drivers/pnp/card.c
index aaa568a380..b68eef2516 100644
--- a/drivers/pnp/card.c
+++ b/drivers/pnp/card.c
@@ -303,13 +303,11 @@ found:
 	down_write(&dev->dev.bus->subsys.rwsem);
 	dev->card_link = clink;
 	dev->dev.driver = &drv->link.driver;
-	if (drv->link.driver.probe) {
-		if (drv->link.driver.probe(&dev->dev)) {
-			dev->dev.driver = NULL;
-			dev->card_link = NULL;
-			up_write(&dev->dev.bus->subsys.rwsem);
-			return NULL;
-		}
+	if (pnp_bus_type.probe(&dev->dev)) {
+		dev->dev.driver = NULL;
+		dev->card_link = NULL;
+		up_write(&dev->dev.bus->subsys.rwsem);
+		return NULL;
 	}
 	device_bind_driver(&dev->dev);
 	up_write(&dev->dev.bus->subsys.rwsem);