Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754510AbZGOMBs (ORCPT ); Wed, 15 Jul 2009 08:01:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752645AbZGOMBs (ORCPT ); Wed, 15 Jul 2009 08:01:48 -0400 Received: from cantor.suse.de ([195.135.220.2]:53019 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752089AbZGOMBr (ORCPT ); Wed, 15 Jul 2009 08:01:47 -0400 Date: Wed, 15 Jul 2009 14:01:44 +0200 Message-ID: From: Takashi Iwai To: Jaswinder Singh Rajput Cc: LKML Subject: Re: [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick In-Reply-To: <1247656540.2432.3.camel@ht.satnam> References: <1247639250.2437.11.camel@ht.satnam> <1247656540.2432.3.camel@ht.satnam> User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.3 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2935 Lines: 86 At Wed, 15 Jul 2009 16:45:40 +0530, Jaswinder Singh Rajput wrote: > > On Wed, 2009-07-15 at 11:10 +0200, Takashi Iwai wrote: > > At Wed, 15 Jul 2009 11:57:30 +0530, > > Jaswinder Singh Rajput wrote: > > > > > > I am getting this compiler warning in linus tree : > > > > > > CC [M] sound/pci/riptide/riptide.o > > > sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’: > > > sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result > > > > > > This fixes the warning in my case, hope this will be helpful : > > > > > > diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c > > > index 235a71e..fd8a552 100644 > > > --- a/sound/pci/riptide/riptide.c > > > +++ b/sound/pci/riptide/riptide.c > > > @@ -2197,9 +2197,9 @@ static int __init alsa_card_riptide_init(void) > > > if (err < 0) > > > return err; > > > #if defined(SUPPORT_JOYSTICK) > > > - pci_register_driver(&joystick_driver); > > > + err = pci_register_driver(&joystick_driver); > > > #endif > > > - return 0; > > > + return err; > > > > In that case, the formerly registered audio driver should be > > unregistered before returning the error from the probe callback. > > Could you fix that? > > > > [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick > > We need to check returning error for pci_register_driver(&joystick_driver) > > On failure, we should unregister formerly registered audio drivers > > This also fixed the compiler warning : > > CC [M] sound/pci/riptide/riptide.o > sound/pci/riptide/riptide.c: In function ‘alsa_card_riptide_init’: > sound/pci/riptide/riptide.c:2200: warning: ignoring return value of ‘__pci_register_driver’, declared with attribute warn_unused_result > > Signed-off-by: Jaswinder Singh Rajput Applied now. Thanks. Takashi > --- > sound/pci/riptide/riptide.c | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/sound/pci/riptide/riptide.c b/sound/pci/riptide/riptide.c > index 235a71e..b5ca02e 100644 > --- a/sound/pci/riptide/riptide.c > +++ b/sound/pci/riptide/riptide.c > @@ -2197,9 +2197,12 @@ static int __init alsa_card_riptide_init(void) > if (err < 0) > return err; > #if defined(SUPPORT_JOYSTICK) > - pci_register_driver(&joystick_driver); > + err = pci_register_driver(&joystick_driver); > + /* On failure unregister formerly registered audio driver */ > + if (err < 0) > + pci_unregister_driver(&driver); > #endif > - return 0; > + return err; > } > > static void __exit alsa_card_riptide_exit(void) > -- > 1.6.0.6 > > > -- 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/