Re: [PATCH] USB Elan FTDI: check for driver registration status

Cyrill Gorcunov
2007-03-27T17:05:26Z

[Luiz Fernando N. Capitulino - Tue, Mar 27, 2007 at 01:28:39PM -0300]
| Em Tue, 27 Mar 2007 19:14:05 +0400
| Cyrill Gorcunov <gorcunov@gmail.com> escreveu:
|
| | Pete, Luiz
| |
| | what about this one?
| |
| | Actually there is just a check for where is error coming from.
| | Maybe that is not the best solution but it allows us to reduce
| | the calls to 'printk' :)
| |
| | P.S. Pete your patch is good but the message about
| | worqueue creation fail was to print even if we've
| | been faltered on the usb_register procedure.
| |
| | ---
| |
| | drivers/usb/misc/ftdi-elan.c | 15 +++++++++++----
| | 1 files changed, 11 insertions(+), 4 deletions(-)
| |
| | diff --git a/drivers/usb/misc/ftdi-elan.c b/drivers/usb/misc/ftdi-elan.c
| | index bc3327e..3cd54af 100644
| | --- a/drivers/usb/misc/ftdi-elan.c
| | +++ b/drivers/usb/misc/ftdi-elan.c
| | @@ -2903,7 +2903,7 @@ static struct usb_driver ftdi_elan_driver = {
| | };
| | static int __init ftdi_elan_init(void)
| | {
| | - int result;
| | + int result = 0;
| | printk(KERN_INFO "driver %s built at %s on %s\n", ftdi_elan_driver.name,
| | __TIME__, __DATE__);
| | init_MUTEX(&ftdi_module_lock);
| | @@ -2918,18 +2918,25 @@ static int __init ftdi_elan_init(void)
| | if (!respond_queue)
| | goto err3;
| | result = usb_register(&ftdi_elan_driver);
| | - if (result)
| | + if (result) {
| | printk(KERN_ERR "usb_register failed. Error number %d\n",
| | result);
| | + goto err4;
| | + }
| | return result;
| |
| | + err4:
| | + destroy_workqueue(respond_queue);
| | err3:
| | destroy_workqueue(command_queue);
| | err2:
| | destroy_workqueue(status_queue);
| | err1:
| | - printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name);
| | - return -ENOMEM;
| | + if (result == 0) {
| | + result = -ENOMEM;
| | + printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name);
| | + }
| | + return result;
| | }
|
| I still the prefer the version I sent you yesterday. :) It
| changes the minimal amount of code.
|
| --
| Luiz Fernando N. Capitulino
|

Liuz,

but the patch you sent me does call

printk(KERN_ERR "%s couldn't create workqueue\n", ftdi_elan_driver.name);

even if error occured in usb_register and that is not good I think.
Fix me if I'm wrong.

Cyrill