lkml.org 
[lkml]   [2010]   [Jul]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:x86/urgent] input: i8042 - add runtime check in x86's i8042_platform_init
    Commit-ID:  5cdfa1c3bbabb809ef3134f741a63e13373a8cad
    Gitweb: http://git.kernel.org/tip/5cdfa1c3bbabb809ef3134f741a63e13373a8cad
    Author: Feng Tang <feng.tang@intel.com>
    AuthorDate: Wed, 7 Jul 2010 13:02:16 -0700
    Committer: H. Peter Anvin <hpa@linux.intel.com>
    CommitDate: Wed, 7 Jul 2010 17:05:07 -0700

    input: i8042 - add runtime check in x86's i8042_platform_init

    Then it will first check x86_platforms's i8042 detection result,
    then go on with normal probe.

    Signed-off-by: Feng Tang <feng.tang@intel.com>
    LKML-Reference: <4c34dd482753bb8f1@agluck-desktop.sc.intel.com>
    Signed-off-by: Tony Luck <tony.luck@intel.com>
    Acked-by: Dmitry Torokhov <dtor@mail.ru>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    drivers/input/serio/i8042-x86ia64io.h | 10 ++++++++++
    1 files changed, 10 insertions(+), 0 deletions(-)

    diff --git a/drivers/input/serio/i8042-x86ia64io.h b/drivers/input/serio/i8042-x86ia64io.h
    index 6168469..81003c4 100644
    --- a/drivers/input/serio/i8042-x86ia64io.h
    +++ b/drivers/input/serio/i8042-x86ia64io.h
    @@ -7,6 +7,10 @@
    * the Free Software Foundation.
    */

    +#ifdef CONFIG_X86
    +#include <asm/x86_init.h>
    +#endif
    +
    /*
    * Names.
    */
    @@ -840,6 +844,12 @@ static int __init i8042_platform_init(void)
    {
    int retval;

    +#ifdef CONFIG_X86
    + /* Just return if pre-detection shows no i8042 controller exist */
    + if (!x86_platform.i8042_detect())
    + return -ENODEV;
    +#endif
    +
    /*
    * On ix86 platforms touching the i8042 data register region can do really
    * bad things. Because of this the region is always reserved on ix86 boxes.

    \
     
     \ /
      Last update: 2010-07-08 09:19    [W:0.025 / U:1.520 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site