lkml.org 
[lkml]   [2008]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 11/18] m68k: Some input drivers do not check the platform
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    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>
    ---
    drivers/input/keyboard/hilkbd.c | 4 ++++
    drivers/input/misc/hp_sdc_rtc.c | 5 +++++
    drivers/input/serio/hp_sdc_mlc.c | 5 +++++
    3 files changed, 14 insertions(+)

    --- a/drivers/input/keyboard/hilkbd.c
    +++ b/drivers/input/keyboard/hilkbd.c
    @@ -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;
    --- a/drivers/input/misc/hp_sdc_rtc.c
    +++ b/drivers/input/misc/hp_sdc_rtc.c
    @@ -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)))
    --- a/drivers/input/serio/hp_sdc_mlc.c
    +++ b/drivers/input/serio/hp_sdc_mlc.c
    @@ -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;
    --
    Gr{oetje,eeting}s,
    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    In personal conversations with technical people, I call myself a hacker. But
    when I'm talking to journalists I just say "programmer" or something like that.
    -- Linus Torvalds



    \
     
     \ /
      Last update: 2008-05-18 21:07    [W:0.045 / U:30.560 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site