Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 893a342a authored by Cyrill Gorcunov's avatar Cyrill Gorcunov Committed by Greg Kroah-Hartman
Browse files

USB Elan FTDI: check for driver registration status 



Add checking of driver registration status and release allocated resources
if it failed.

Signed-off-by: default avatarCyrill Gorcunov <gorcunov@gmail.com>
Cc: Pete Zaitcev <zaitcev@redhat.com>
Cc: "Luiz Fernando N. Capitulino" <lcapitulino@mandriva.com.br>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent f094e4f3

drivers/usb/misc/ftdi-elan.c

+11 −7
Original line number Diff line number Diff line
@@ -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;

}