lkml.org 
[lkml]   [2011]   [Apr]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] Input: h3600_ts_input - bugfix for request_irq()/free_irq() parameters
    From
    Date
    The dev field of h3600_dev is a pointer, thus use ts->dev instead of &ts->dev
    as the dev_id argument while calling request_irq()/free_irq().

    Signed-off-by: Axel Lin <axel.lin@gmail.com>
    ---
    drivers/input/touchscreen/h3600_ts_input.c | 8 ++++----
    1 files changed, 4 insertions(+), 4 deletions(-)

    diff --git a/drivers/input/touchscreen/h3600_ts_input.c b/drivers/input/touchscreen/h3600_ts_input.c
    index 45f93d0..211811a 100644
    --- a/drivers/input/touchscreen/h3600_ts_input.c
    +++ b/drivers/input/touchscreen/h3600_ts_input.c
    @@ -396,14 +396,14 @@ static int h3600ts_connect(struct serio *serio, struct serio_driver *drv)
    set_GPIO_IRQ_edge(GPIO_BITSY_NPOWER_BUTTON, GPIO_RISING_EDGE);

    if (request_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, action_button_handler,
    - IRQF_SHARED | IRQF_DISABLED, "h3600_action", &ts->dev)) {
    + IRQF_SHARED | IRQF_DISABLED, "h3600_action", ts->dev)) {
    printk(KERN_ERR "h3600ts.c: Could not allocate Action Button IRQ!\n");
    err = -EBUSY;
    goto fail1;
    }

    if (request_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, npower_button_handler,
    - IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", &ts->dev)) {
    + IRQF_SHARED | IRQF_DISABLED, "h3600_suspend", ts->dev)) {
    printk(KERN_ERR "h3600ts.c: Could not allocate Power Button IRQ!\n");
    err = -EBUSY;
    goto fail2;
    @@ -439,8 +439,8 @@ static void h3600ts_disconnect(struct serio *serio)
    {
    struct h3600_dev *ts = serio_get_drvdata(serio);

    - free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, &ts->dev);
    - free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, &ts->dev);
    + free_irq(IRQ_GPIO_BITSY_ACTION_BUTTON, ts->dev);
    + free_irq(IRQ_GPIO_BITSY_NPOWER_BUTTON, ts->dev);
    input_get_device(ts->dev);
    input_unregister_device(ts->dev);
    serio_close(serio);
    --
    1.7.1




    \
     
     \ /
      Last update: 2011-04-13 14:39    [W:0.025 / U:157.776 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site