Merge branch 'fix/misc' into for-linus

* fix/misc: ALSA: riptide - proper handling of pci_register_driver for joystick
git-mirror · Jul 16, 2009 · 9d79b13 · 9d79b13
2 parents 2688779 + cb65c87
commit 9d79b13
Showing 1 changed file with 5 additions and 2 deletions.
diff --git 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)