dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

Merge branch 'fix/misc' into for-linus 

* 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
parent 26887793b6 cb65c8732a
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)
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)