Skip to content

Commit

Permalink
m68k: Some input drivers do not check the platform
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Geert Uytterhoeven authored and Linus Torvalds committed May 18, 2008
1 parent 0f73448 commit eb98630
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 0 deletions.
4 changes: 4 additions & 0 deletions drivers/input/keyboard/hilkbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
5 changes: 5 additions & 0 deletions drivers/input/misc/hp_sdc_rtc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
5 changes: 5 additions & 0 deletions drivers/input/serio/hp_sdc_mlc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit eb98630

Please sign in to comment.