diff --git a/[refs] b/[refs]
index 6c6d7f7648cf..ea230cb28f0f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d110271e1f4140a9fb06d968b1afe9ca56a6064e
+refs/heads/master: 5247aecfe62266ffdedf2fc9e4243638554455b6
diff --git a/trunk/drivers/base/base.h b/trunk/drivers/base/base.h
index ddc97496db4a..b528145a078f 100644
--- a/trunk/drivers/base/base.h
+++ b/trunk/drivers/base/base.h
@@ -115,7 +115,7 @@ extern int driver_probe_device(struct device_driver *drv, struct device *dev);
 static inline int driver_match_device(struct device_driver *drv,
 				      struct device *dev)
 {
-	return drv->bus->match && drv->bus->match(dev, drv);
+	return drv->bus->match ? drv->bus->match(dev, drv) : 1;
 }
 
 extern void sysdev_shutdown(void);