m68k: Some input drivers do not check the platform
Some input drivers do not check whether they're actually running on the correct platform, causing multi-platform kernels to crash if they are not. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
0f734484ac
commit
eb98630ba0
|
@ -217,6 +217,10 @@ hil_keyb_init(void)
|
|||
return -ENOMEM;
|
||||
|
||||
#if defined(CONFIG_HP300)
|
||||
if (!MACH_IS_HP300) {
|
||||
err = -ENODEV;
|
||||
goto err1;
|
||||
}
|
||||
if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
|
||||
printk(KERN_ERR "HIL: hardware register was not found\n");
|
||||
err = -ENODEV;
|
||||
|
|
|
@ -691,6 +691,11 @@ static int __init hp_sdc_rtc_init(void)
|
|||
{
|
||||
int ret;
|
||||
|
||||
#ifdef __mc68000__
|
||||
if (!MACH_IS_HP300)
|
||||
return -ENODEV;
|
||||
#endif
|
||||
|
||||
init_MUTEX(&i8042tregs);
|
||||
|
||||
if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
|
||||
|
|
|
@ -306,6 +306,11 @@ static int __init hp_sdc_mlc_init(void)
|
|||
{
|
||||
hil_mlc *mlc = &hp_sdc_mlc;
|
||||
|
||||
#ifdef __mc68000__
|
||||
if (!MACH_IS_HP300)
|
||||
return -ENODEV;
|
||||
#endif
|
||||
|
||||
printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
|
||||
|
||||
hp_sdc_mlc_priv.emtestmode = 0;
|
||||
|
|
Loading…
Reference in New Issue