From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933063AbXC0Q2w (ORCPT ); Tue, 27 Mar 2007 12:28:52 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S933036AbXC0Q2w (ORCPT ); Tue, 27 Mar 2007 12:28:52 -0400 Received: from perninha.conectiva.com.br ([200.140.247.100]:33336 "EHLO perninha.conectiva.com.br" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933063AbXC0Q2v (ORCPT ); Tue, 27 Mar 2007 12:28:51 -0400 Date: Tue, 27 Mar 2007 13:28:39 -0300 From: "Luiz Fernando N. Capitulino" To: Cyrill Gorcunov Cc: Pete Zaitcev , Andrew Morton , linux-kernel-list Subject: Re: [PATCH] USB Elan FTDI: check for driver registration status Message-ID: <20070327132839.71169aed@localhost> In-Reply-To: <20070327151405.GA11491@cvg> References: <20070325072733.GA10257@cvg> <20070326151731.53cc080b.zaitcev@redhat.com> <20070327151405.GA11491@cvg> Organization: Mandriva X-Mailer: Sylpheed-Claws 2.5.0-rc3 (GTK+ 2.10.3; i586-mandriva-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Em Tue, 27 Mar 2007 19:14:05 +0400 Cyrill Gorcunov 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