lkml.org 
[lkml]   [2006]   [Feb]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[GIT PATCH 14/18] turbografx: handle errors from input_register_device()
    Input: turbografx - handle errors from input_register_device()

    Also tgfx_remove shouldn't be marked __exit as it is also called from
    __init code.

    Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
    ---

    drivers/input/joystick/turbografx.c | 20 +++++++++++++-------
    1 files changed, 13 insertions(+), 7 deletions(-)

    Index: work/drivers/input/joystick/turbografx.c
    ===================================================================
    --- work.orig/drivers/input/joystick/turbografx.c
    +++ work/drivers/input/joystick/turbografx.c
    @@ -204,14 +204,14 @@ static struct tgfx __init *tgfx_probe(in
    if (n_buttons[i] > 6) {
    printk(KERN_ERR "turbografx.c: Invalid number of buttons %d\n", n_buttons[i]);
    err = -EINVAL;
    - goto err_free_devs;
    + goto err_unreg_devs;
    }

    tgfx->dev[i] = input_dev = input_allocate_device();
    if (!input_dev) {
    printk(KERN_ERR "turbografx.c: Not enough memory for input device\n");
    err = -ENOMEM;
    - goto err_free_devs;
    + goto err_unreg_devs;
    }

    tgfx->sticks |= (1 << i);
    @@ -238,7 +238,9 @@ static struct tgfx __init *tgfx_probe(in
    for (j = 0; j < n_buttons[i]; j++)
    set_bit(tgfx_buttons[j], input_dev->keybit);

    - input_register_device(tgfx->dev[i]);
    + err = input_register_device(tgfx->dev[i]);
    + if (err)
    + goto err_free_dev;
    }

    if (!tgfx->sticks) {
    @@ -249,9 +251,12 @@ static struct tgfx __init *tgfx_probe(in

    return tgfx;

    - err_free_devs:
    + err_free_dev:
    + input_free_device(tgfx->dev[i]);
    + err_unreg_devs:
    while (--i >= 0)
    - input_unregister_device(tgfx->dev[i]);
    + if (tgfx->dev[i])
    + input_unregister_device(tgfx->dev[i]);
    err_free_tgfx:
    kfree(tgfx);
    err_unreg_pardev:
    @@ -262,7 +267,7 @@ static struct tgfx __init *tgfx_probe(in
    return ERR_PTR(err);
    }

    -static void __exit tgfx_remove(struct tgfx *tgfx)
    +static void tgfx_remove(struct tgfx *tgfx)
    {
    int i;

    @@ -300,7 +305,8 @@ static int __init tgfx_init(void)

    if (err) {
    while (--i >= 0)
    - tgfx_remove(tgfx_base[i]);
    + if (tgfx_base[i])
    + tgfx_remove(tgfx_base[i]);
    return err;
    }

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2006-02-01 06:44    [W:0.026 / U:0.128 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site