sound/pci/riptide/riptide.c compiler warning
I am getting this compiler warning in linus tree :
CC [M] sound/pci/riptide/riptide.osound/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 :
sound/pci/riptide/riptide.c +2 -2
@@ -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; } static void __exit alsa_card_riptide_exit(void)
--
JSR
At Wed, 15 Jul 2009 11:57:30 +0530,
Quoted 14 lines · Jaswinder Singh Rajput
I am getting this compiler warning in linus tree :
CC [M]
sound/pci/riptide/riptide.osound/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 attributewarn_unused_resultThis fixes the warning in my case, hope this will be helpful :
sound/pci/riptide/riptide.c +0
-0
sound/pci/riptide/riptide.c static int __init alsa_card_riptide_init(void) · line 2202
Quoted 8 lines
sound/pci/riptide/riptide.c +2
-2@@ -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?
thanks,
Takashi
PATCH 1/1 SOUND: riptide.c proper handling of pci_register_driver for joystick
Quoted 20 lines · Takashi Iwai
At Wed, 15 Jul 2009 11:57:30 +0530,
Quoted 18 lines · Jaswinder Singh Rajput
I am getting this compiler warning in linus tree :
CC [M]
sound/pci/riptide/riptide.osound/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 attributewarn_unused_resultThis fixes the warning in my case, hope this will be helpful :
sound/pci/riptide/riptide.c +0
-1@@ -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);
Quoted 9 lines
sound/pci/riptide/riptide.c static int __init alsa_card_riptide_init(void) · line 2202
Quoted 4 lines
sound/pci/riptide/riptide.c +2
-1+ 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
--- sound/pci/riptide/riptide.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)
sound/pci/riptide/riptide.c +5 -2
@@ -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)
Signature · 1 line
1.6.0.6
Re: [PATCH] SOUND: riptide.c proper handling of pci_register_driver for joystick
At Wed, 15 Jul 2009 16:45:40 +0530,
Quoted 38 lines · Jaswinder Singh Rajput
Quoted 20 lines · Takashi Iwai
At Wed, 15 Jul 2009 11:57:30 +0530,
Quoted 18 lines · Jaswinder Singh Rajput
I am getting this compiler warning in linus tree :
CC [M]
sound/pci/riptide/riptide.osound/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 attributewarn_unused_resultThis fixes the warning in my case, hope this will be helpful :
sound/pci/riptide/riptide.c +0
-1@@ -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);Quoted 9 lines
sound/pci/riptide/riptide.c static int __init alsa_card_riptide_init(void) · line 2205
Quoted 4 lines
sound/pci/riptide/riptide.c +2
-1+ 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.cproper handling ofpci_register_driverfor joystickWe need to check returning error for
pci_register_driver(&joystick_driver)On failure, we should unregister formerly registered audio drivers
Quoted 7 lines
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 attributewarn_unused_resultSigned-off-by Jaswinder Singh Rajput <[email protected]>
Applied now. Thanks.
Takashi
Quoted 28 lines
--- sound/pci/riptide/riptide.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-)sound/pci/riptide/riptide.c +5
-2@@ -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)Signature · 1 line
1.6.0.6