Merge branch 'next' into for-linus

1 files changed, 3 insertions, 2 deletions

diff --git a/include/linux/of_device.h b/include/linux/of_device.h
index 975d347079d9..8bfe6c1d4365 100644
--- a/include/linux/of_device.h
+++ b/include/linux/of_device.h
@@ -18,10 +18,11 @@ extern void of_device_make_bus_id(struct device *dev);
  * @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,
+static inline int of_driver_match_device(struct device *dev,
                                          const struct device_driver *drv)
 {
-        return of_match_device(drv->of_match_table, dev) != NULL;
+        dev->of_match = of_match_device(drv->of_match_table, dev);
+        return dev->of_match != NULL;
 }
 
 extern struct platform_device *of_dev_get(struct platform_device *dev);