Message ID | 20110518192100.28986.94335.stgit@ponder |
---|---|
State | Not Applicable |
Delegated to: | David Miller |
Headers | show |
On Wed, May 18, 2011 at 01:21:00PM -0600, Grant Likely wrote: > From: Milton Miller <miltonm@bga.com> > > If two drivers are probing devices at the same time, both will write > their match table result to the dev->of_match cache at the same time. > > Only write the result if the device matches. > > In a thread titled "SBus devices sometimes detected, sometimes not", > Meelis reported his SBus hme was not detected about 50% of the time. > >From the debug suggested by Grant it was obvious another driver matched > some devices between the call to match the hme and the hme discovery > failling. > > Reported-by: Meelis Roos <mroos@linux.ee> > Signed-off-by: Milton Miller <miltonm@bga.com> > [grant.likely: modified to only call of_match_device() once] > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Acked-by: Greg Kroah-Hartman <gregkh@suse.de> -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Grant Likely <grant.likely@secretlab.ca> Date: Wed, 18 May 2011 13:21:00 -0600 > From: Milton Miller <miltonm@bga.com> > > If two drivers are probing devices at the same time, both will write > their match table result to the dev->of_match cache at the same time. > > Only write the result if the device matches. > > In a thread titled "SBus devices sometimes detected, sometimes not", > Meelis reported his SBus hme was not detected about 50% of the time. >>From the debug suggested by Grant it was obvious another driver matched > some devices between the call to match the hme and the hme discovery > failling. > > Reported-by: Meelis Roos <mroos@linux.ee> > Signed-off-by: Milton Miller <miltonm@bga.com> > [grant.likely: modified to only call of_match_device() once] > Signed-off-by: Grant Likely <grant.likely@secretlab.ca> Tested on SunBlade2500 and Niagara2+ Acked-by: David S. Miller <davem@davemloft.net> -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/linux/of_device.h b/include/linux/of_device.h index 8bfe6c1..b33d688 100644 --- a/include/linux/of_device.h +++ b/include/linux/of_device.h @@ -21,8 +21,12 @@ extern void of_device_make_bus_id(struct device *dev); static inline int of_driver_match_device(struct device *dev, const struct device_driver *drv) { - dev->of_match = of_match_device(drv->of_match_table, dev); - return dev->of_match != NULL; + const struct of_device_id *match; + + match = of_match_device(drv->of_match_table, dev); + if (match) + dev->of_match = match; + return match != NULL; } extern struct platform_device *of_dev_get(struct platform_device *dev);