Merge branch 'fix/misc' into for-linus (9d79b136) · Commits · e / devices / android_kernel_xiaomi_markw

sound/pci/riptide/riptide.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -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)