Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932805Ab2HIOEy (ORCPT ); Thu, 9 Aug 2012 10:04:54 -0400 Received: from cantor2.suse.de ([195.135.220.15]:60158 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932626Ab2HIOEw (ORCPT ); Thu, 9 Aug 2012 10:04:52 -0400 Date: Thu, 09 Aug 2012 16:04:51 +0200 Message-ID: From: Takashi Iwai To: David Henningsson Cc: Thierry Reding , alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/2 v2] ALSA: hda - Deferred probing with request_firmware_nowait() In-Reply-To: <5023C0FC.2030207@canonical.com> References: <1344494723-6827-1-git-send-email-thierry.reding@avionic-design.de> <20120809070813.GA6979@avionic-0098.mockup.avionic-design.de> <20120809073642.GA24695@avionic-0098.mockup.avionic-design.de> <20120809080713.GC24808@avionic-0098.mockup.avionic-design.de> <20120809103430.GA1560@avionic-0098.mockup.avionic-design.de> <5023BAA0.1080304@canonical.com> <5023C0FC.2030207@canonical.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/24.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1882 Lines: 71 At Thu, 09 Aug 2012 15:54:04 +0200, David Henningsson wrote: > > On 08/09/2012 03:36 PM, Takashi Iwai wrote: > > +/* callback from request_firmware_nowait() */ > > +static void azx_firmware_cb(const struct firmware *fw, void *context) > > +{ > > + struct snd_card *card = context; > > + struct azx *chip = card->private_data; > > + struct pci_dev *pci = chip->pci; > > + > > + if (!fw) { > > + snd_printk(KERN_ERR SFX "Cannot load firmware, aborting\n"); > > + goto error; > > + } > > Another thing, aren't you missing a > > chip->fw = fw; > > here? Ah, yes. > > + > > + if (!chip->disabled) { > > + /* continue probing */ > > + if (azx_probe_continue(chip)) > > + goto error; > > + } > > + return; /* OK */ > > + > > + error: > > + snd_card_free(card); > > + pci_set_drvdata(pci, NULL); > > +} > > + > > static int __devinit azx_probe(struct pci_dev *pci, > > const struct pci_device_id *pci_id) > > { > > static int dev; > > struct snd_card *card; > > struct azx *chip; > > + bool probe_deferred; > > int err; > > > > if (dev >= SNDRV_CARDS) > > @@ -3182,18 +3211,22 @@ static int __devinit azx_probe(struct pci_dev *pci, > > if (err < 0) > > goto out_free; > > card->private_data = chip; > > Right, this patch has the race removed, as the variable is no longer set > in azx_firmware_cb. To be picky, it's slightly confusing that > probe_deferred is also used for signalling a disabled chip. Maybe > "probe_now" (inverted) would have been even better, like this: Yeah, this looks slightly more straightforward. I'm going to send a revised version shortly. thanks, Takashi -- 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/