lkml.org 
[lkml]   [2007]   [Mar]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    SubjectRe: [PATCH] USB Elan FTDI: check for driver registration status
    Pete, Luiz

    check this one please.

    I've inspected ftdi-elan.c for style and as result
    the solution I propose is just to add explicit
    destroying of worqueues if usb_register failed.

    And Pete, take a look - whoa! - I've renamed error labels :)


    Cyrill

    ---

    drivers/usb/misc/ftdi-elan.c | 18 +++++++++++-------
    1 files changed, 11 insertions(+), 7 deletions(-)

    diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
    index bc3327e..d9cbdb8 100644
    --- a/drivers/usb/misc/ftdi-elan.c
    +++ b/drivers/usb/misc/ftdi-elan.c
    @@ -2910,24 +2910,28 @@ static int __init ftdi_elan_init(void)
    INIT_LIST_HEAD(&ftdi_static_list);
    status_queue = create_singlethread_workqueue("ftdi-status-control");
    if (!status_queue)
    - goto err1;
    + goto err_status_queue;
    command_queue = create_singlethread_workqueue("ftdi-command-engine");
    if (!command_queue)
    - goto err2;
    + goto err_command_queue;
    respond_queue = create_singlethread_workqueue("ftdi-respond-engine");
    if (!respond_queue)
    - goto err3;
    + goto err_respond_queue;
    result = usb_register(&ftdi_elan_driver);
    - if (result)
    + if (result) {
    + destroy_workqueue(status_queue);
    + destroy_workqueue(command_queue);
    + destroy_workqueue(respond_queue);
    printk(KERN_ERR "usb_register failed. Error number %d\n",
    result);
    + }
    return result;

    - err3:
    + err_respond_queue:
    destroy_workqueue(command_queue);
    - err2:
    + err_command_queue:
    destroy_workqueue(status_queue);
    - err1:
    + err_status_queue:
    printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name);
    return -ENOMEM;
    }
    -
    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: 2007-03-28 18:07    [W:2.414 / U:0.408 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site