[POWERPC] ps3: always make sure we're running on a PS3
Add missing checks to PS3 specific drivers ps3av and sys-manager to verify that we are actually running on a PS3 (pointed out by Arnd). Correct existing checks in other subsystems/drivers to return -ENODEV instead of zero. Signed-off-by: Geert Uytterhoeven <Geert.Uytterhoeven@sonycom.com> Acked-by: Arnd Bergmann <arnd.bergmann@de.ibm.com> Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Родитель
02567c6cda
Коммит
8170f52489
|
@ -294,7 +294,7 @@ static int __init ps3_mm_add_memory(void)
|
|||
unsigned long nr_pages;
|
||||
|
||||
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
|
||||
BUG_ON(!mem_init_done);
|
||||
|
||||
|
|
|
@ -172,7 +172,7 @@ int __init ps3_system_bus_init(void)
|
|||
int result;
|
||||
|
||||
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
|
||||
result = bus_register(&ps3_system_bus_type);
|
||||
BUG_ON(result);
|
||||
|
|
|
@ -24,6 +24,8 @@
|
|||
#include <linux/reboot.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/ioctl.h>
|
||||
|
||||
#include <asm/firmware.h>
|
||||
#include <asm/lv1call.h>
|
||||
#include <asm/ps3av.h>
|
||||
#include <asm/ps3.h>
|
||||
|
@ -947,7 +949,12 @@ static struct ps3_vuart_port_driver ps3av_driver = {
|
|||
|
||||
static int ps3av_module_init(void)
|
||||
{
|
||||
int error = ps3_vuart_port_driver_register(&ps3av_driver);
|
||||
int error;
|
||||
|
||||
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||
return -ENODEV;
|
||||
|
||||
error = ps3_vuart_port_driver_register(&ps3av_driver);
|
||||
if (error) {
|
||||
printk(KERN_ERR
|
||||
"%s: ps3_vuart_port_driver_register failed %d\n",
|
||||
|
|
|
@ -22,7 +22,10 @@
|
|||
#include <linux/module.h>
|
||||
#include <linux/workqueue.h>
|
||||
#include <linux/reboot.h>
|
||||
|
||||
#include <asm/firmware.h>
|
||||
#include <asm/ps3.h>
|
||||
|
||||
#include "vuart.h"
|
||||
|
||||
MODULE_AUTHOR("Sony Corporation");
|
||||
|
@ -598,6 +601,9 @@ static struct ps3_vuart_port_driver ps3_sys_manager = {
|
|||
|
||||
static int __init ps3_sys_manager_init(void)
|
||||
{
|
||||
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||
return -ENODEV;
|
||||
|
||||
return ps3_vuart_port_driver_register(&ps3_sys_manager);
|
||||
}
|
||||
|
||||
|
|
|
@ -1031,7 +1031,7 @@ int __init ps3_vuart_bus_init(void)
|
|||
pr_debug("%s:%d:\n", __func__, __LINE__);
|
||||
|
||||
if (!firmware_has_feature(FW_FEATURE_PS3_LV1))
|
||||
return 0;
|
||||
return -ENODEV;
|
||||
|
||||
init_MUTEX(&vuart_bus_priv.probe_mutex);
|
||||
result = bus_register(&ps3_vuart_bus);
|
||||
|
|
Загрузка…
Ссылка в новой задаче