Commit cb65c873 authored by Jaswinder Singh Rajput's avatar Jaswinder Singh Rajput Committed by Takashi Iwai

ALSA: riptide - 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: default avatarJaswinder Singh Rajput <jaswinderrajput@gmail.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent c2a30d71
...@@ -2197,9 +2197,12 @@ static int __init alsa_card_riptide_init(void) ...@@ -2197,9 +2197,12 @@ static int __init alsa_card_riptide_init(void)
if (err < 0) if (err < 0)
return err; return err;
#if defined(SUPPORT_JOYSTICK) #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 #endif
return 0; return err;
} }
static void __exit alsa_card_riptide_exit(void) static void __exit alsa_card_riptide_exit(void)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment