From c618594d5f7b91817f36374117523a1f4574cc55 Mon Sep 17 00:00:00 2001
From: Grant Likely <grant.likely@secretlab.ca>
Date: Tue, 8 Jun 2010 07:48:17 -0600
Subject: [PATCH] --- yaml --- r: 204906 b: refs/heads/master c:
 8cec0e7b4c7c0b76f2b5285f250211ad81c3eafd h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/of/device.c       |  2 +-
 trunk/include/linux/of_device.h | 19 +++++++++++++++++++
 3 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 60ef0efb95e9..7a2a7a2c4ef2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2e13cba8dc35774bf1d7169733e876c5b7adee54
+refs/heads/master: 8cec0e7b4c7c0b76f2b5285f250211ad81c3eafd
diff --git a/trunk/drivers/of/device.c b/trunk/drivers/of/device.c
index c2a98f5ca80d..5282a202f5a9 100644
--- a/trunk/drivers/of/device.c
+++ b/trunk/drivers/of/device.c
@@ -20,7 +20,7 @@
 const struct of_device_id *of_match_device(const struct of_device_id *matches,
 					   const struct device *dev)
 {
-	if (!dev->of_node)
+	if ((!matches) || (!dev->of_node))
 		return NULL;
 	return of_match_node(matches, dev->of_node);
 }
diff --git a/trunk/include/linux/of_device.h b/trunk/include/linux/of_device.h
index 238e92e007e6..91d75fb0c726 100644
--- a/trunk/include/linux/of_device.h
+++ b/trunk/include/linux/of_device.h
@@ -30,6 +30,17 @@
 extern const struct of_device_id *of_match_device(
 	const struct of_device_id *matches, const struct device *dev);
 
+/**
+ * of_driver_match_device - Tell if a driver's of_match_table matches a device.
+ * @drv: the device_driver structure to test
+ * @dev: the device structure to match against
+ */
+static inline int of_driver_match_device(const struct device *dev,
+					 const struct device_driver *drv)
+{
+	return of_match_device(drv->of_match_table, dev) != NULL;
+}
+
 extern struct of_device *of_dev_get(struct of_device *dev);
 extern void of_dev_put(struct of_device *dev);
 
@@ -48,6 +59,14 @@ extern ssize_t of_device_get_modalias(struct device *dev,
 extern int of_device_uevent(struct device *dev, struct kobj_uevent_env *env);
 
 
+#else /* CONFIG_OF_DEVICE */
+
+static inline int of_driver_match_device(struct device *dev,
+					 struct device_driver *drv)
+{
+	return 0;
+}
+
 #endif /* CONFIG_OF_DEVICE */
 
 #endif /* _LINUX_OF_DEVICE_H */