adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 19:56:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'fix/misc' into for-linus

Browse source 
* fix/misc:
  ALSA: riptide -  proper handling of pci_register_driver for joystick
This commit is contained in:
Takashi Iwai 2009-07-16 16:35:48 +02:00
commit 9d79b13691
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
sound/pci/riptide/riptide.c
View file

@ -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)