lkml.org 
[lkml]   [2011]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
DateWed, 18 May 2011 10:21:39 -0600
FromGrant Likely <>
SubjectRe: [PATCH] of: fix race when matching drivers
On Wed, May 18, 2011 at 05:45:17PM +0200, Josip Rodin wrote:
> On Wed, May 18, 2011 at 10:27:39AM -0500, Milton Miller wrote:
> > --- work.git.orig/include/linux/of_device.h 2011-05-18 09:57:01.014386816 -0500
> > +++ work.git/include/linux/of_device.h 2011-05-18 09:58:27.537431575 -0500
> > @@ -21,8 +21,15 @@ extern void of_device_make_bus_id(struct
> > 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 = of_match_device(drv->of_match_table, dev);
> > + return 1;
> > + }
> > +
> > + return 0;
> > }
>
> Err, is there some reason to avoid simply assigning the existing result:
> dev->of_match = match; ?

Good point. I've committed and am currently testing the modified version.

g.


\
 
 \ /
  Last update: 2011-05-18 18:23    [from the cache]
©2003-2010