diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-07-15 14:01:02 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-07-15 14:01:02 +0200 |
| commit | a7b4c17013b4ce416572e03e56c5ec6f0bb59260 (patch) | |
| tree | 0ea667b7dae58e1262b5277f853b8dc77976e5d9 /sound | |
| parent | 6469753fb88d8294ec2230c1daa562518c212d1b (diff) | |
| parent | cb65c8732a50f8a145d36dbdac026a1789ad1587 (diff) | |
Merge branch 'fix/misc' into for-next
Diffstat (limited to 'sound')
| -rw-r--r-- | 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 235a71e5ac8d..b5ca02e2038c 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) |