Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932887Ab1ERQVn (ORCPT ); Wed, 18 May 2011 12:21:43 -0400 Received: from mail-pw0-f46.google.com ([209.85.160.46]:55043 "EHLO mail-pw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932688Ab1ERQVm (ORCPT ); Wed, 18 May 2011 12:21:42 -0400 Date: Wed, 18 May 2011 10:21:39 -0600 From: Grant Likely To: Josip Rodin Cc: Milton Miller , David Miller , devicetree-discuss@lists.ozlabs.org, linux-kernel@vger.kernel.org, sparclinux@vger.kernel.org Subject: Re: [PATCH] of: fix race when matching drivers Message-ID: <20110518162139.GA11027@ponder.secretlab.ca> References: <20110517.134312.226762699.davem@davemloft.net> <1305732459_6563@mail4.comsite.net> <20110518154517.GA26070@entuzijast.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20110518154517.GA26070@entuzijast.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1243 Lines: 32 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. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/