Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit eb98630ba02f6a23a2d202be082757a9e9940b2b

Authored by Geert Uytterhoeven
Committed by Linus Torvalds
1 parent 0f734484ac

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>

Showing 3 changed files with 14 additions and 0 deletions Side-by-side Diff

drivers/input/keyboard/hilkbd.c
Diff comments   View file @ eb98630
... ... @@ -217,6 +217,10 @@
217 217 return -ENOMEM;
218 218  
219 219 #if defined(CONFIG_HP300)
  220 + if (!MACH_IS_HP300) {
  221 + err = -ENODEV;
  222 + goto err1;
  223 + }
220 224 if (!hwreg_present((void *)(HILBASE + HIL_DATA))) {
221 225 printk(KERN_ERR "HIL: hardware register was not found\n");
222 226 err = -ENODEV;
drivers/input/misc/hp_sdc_rtc.c
Diff comments   View file @ eb98630
... ... @@ -691,6 +691,11 @@
691 691 {
692 692 int ret;
693 693  
  694 +#ifdef __mc68000__
  695 + if (!MACH_IS_HP300)
  696 + return -ENODEV;
  697 +#endif
  698 +
694 699 init_MUTEX(&i8042tregs);
695 700  
696 701 if ((ret = hp_sdc_request_timer_irq(&hp_sdc_rtc_isr)))
drivers/input/serio/hp_sdc_mlc.c
Diff comments   View file @ eb98630
... ... @@ -306,6 +306,11 @@
306 306 {
307 307 hil_mlc *mlc = &hp_sdc_mlc;
308 308  
  309 +#ifdef __mc68000__
  310 + if (!MACH_IS_HP300)
  311 + return -ENODEV;
  312 +#endif
  313 +
309 314 printk(KERN_INFO PREFIX "Registering the System Domain Controller's HIL MLC.\n");
310 315  
311 316 hp_sdc_mlc_priv.emtestmode = 0;