USB: ps3: don't call ps3_system_bus_driver_register on other platforms
ps3_system_bus_driver_register is PS3 platform specific function. On other platforms, it triggers WARN_ON in kref_get. Signed-off-by: Kou Ishizaki <kou.ishizaki@toshiba.co.jp> Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: David Brownell <dbrownell@users.sourceforge.net> Cc: Geoff Levand <geoffrey.levand@am.sony.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
7426fa8081
commit
48fda45120
|
@ -42,6 +42,9 @@
|
||||||
#include <asm/irq.h>
|
#include <asm/irq.h>
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
|
#ifdef CONFIG_PPC_PS3
|
||||||
|
#include <asm/firmware.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------*/
|
/*-------------------------------------------------------------------------*/
|
||||||
|
@ -968,15 +971,18 @@ static int __init ehci_hcd_init(void)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PS3_SYSTEM_BUS_DRIVER
|
#ifdef PS3_SYSTEM_BUS_DRIVER
|
||||||
retval = ps3_system_bus_driver_register(&PS3_SYSTEM_BUS_DRIVER);
|
if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
|
||||||
if (retval < 0) {
|
retval = ps3_system_bus_driver_register(
|
||||||
|
&PS3_SYSTEM_BUS_DRIVER);
|
||||||
|
if (retval < 0) {
|
||||||
#ifdef PLATFORM_DRIVER
|
#ifdef PLATFORM_DRIVER
|
||||||
platform_driver_unregister(&PLATFORM_DRIVER);
|
platform_driver_unregister(&PLATFORM_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
#ifdef PCI_DRIVER
|
#ifdef PCI_DRIVER
|
||||||
pci_unregister_driver(&PCI_DRIVER);
|
pci_unregister_driver(&PCI_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
return retval;
|
return retval;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -993,7 +999,8 @@ static void __exit ehci_hcd_cleanup(void)
|
||||||
pci_unregister_driver(&PCI_DRIVER);
|
pci_unregister_driver(&PCI_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
#ifdef PS3_SYSTEM_BUS_DRIVER
|
#ifdef PS3_SYSTEM_BUS_DRIVER
|
||||||
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
if (firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||||
|
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
module_exit(ehci_hcd_cleanup);
|
module_exit(ehci_hcd_cleanup);
|
||||||
|
|
|
@ -42,6 +42,9 @@
|
||||||
#include <asm/system.h>
|
#include <asm/system.h>
|
||||||
#include <asm/unaligned.h>
|
#include <asm/unaligned.h>
|
||||||
#include <asm/byteorder.h>
|
#include <asm/byteorder.h>
|
||||||
|
#ifdef CONFIG_PPC_PS3
|
||||||
|
#include <asm/firmware.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#include "../core/hcd.h"
|
#include "../core/hcd.h"
|
||||||
|
|
||||||
|
@ -944,9 +947,12 @@ static int __init ohci_hcd_mod_init(void)
|
||||||
sizeof (struct ed), sizeof (struct td));
|
sizeof (struct ed), sizeof (struct td));
|
||||||
|
|
||||||
#ifdef PS3_SYSTEM_BUS_DRIVER
|
#ifdef PS3_SYSTEM_BUS_DRIVER
|
||||||
retval = ps3_system_bus_driver_register(&PS3_SYSTEM_BUS_DRIVER);
|
if (firmware_has_feature(FW_FEATURE_PS3_LV1)) {
|
||||||
if (retval < 0)
|
retval = ps3_system_bus_driver_register(
|
||||||
goto error_ps3;
|
&PS3_SYSTEM_BUS_DRIVER);
|
||||||
|
if (retval < 0)
|
||||||
|
goto error_ps3;
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef PLATFORM_DRIVER
|
#ifdef PLATFORM_DRIVER
|
||||||
|
@ -992,7 +998,8 @@ static int __init ohci_hcd_mod_init(void)
|
||||||
error_platform:
|
error_platform:
|
||||||
#endif
|
#endif
|
||||||
#ifdef PS3_SYSTEM_BUS_DRIVER
|
#ifdef PS3_SYSTEM_BUS_DRIVER
|
||||||
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
if (firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||||
|
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
||||||
error_ps3:
|
error_ps3:
|
||||||
#endif
|
#endif
|
||||||
return retval;
|
return retval;
|
||||||
|
@ -1014,7 +1021,8 @@ static void __exit ohci_hcd_mod_exit(void)
|
||||||
platform_driver_unregister(&PLATFORM_DRIVER);
|
platform_driver_unregister(&PLATFORM_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
#ifdef PS3_SYSTEM_BUS_DRIVER
|
#ifdef PS3_SYSTEM_BUS_DRIVER
|
||||||
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
if (firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||||
|
ps3_system_bus_driver_unregister(&PS3_SYSTEM_BUS_DRIVER);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
module_exit(ohci_hcd_mod_exit);
|
module_exit(ohci_hcd_mod_exit);
|
||||||
|
|
Loading…
Reference in a new issue