Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752406Ab1C2Kc5 (ORCPT ); Tue, 29 Mar 2011 06:32:57 -0400 Received: from na3sys009aog112.obsmtp.com ([74.125.149.207]:33728 "EHLO na3sys009aog112.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751786Ab1C2Kc4 (ORCPT ); Tue, 29 Mar 2011 06:32:56 -0400 From: Keshava Munegowda References: <1301393275.2253.7.camel@phoenix> MIME-Version: 1.0 X-Mailer: Microsoft Office Outlook 11 In-Reply-To: <1301393275.2253.7.camel@phoenix> Thread-Index: Acvt+TThtydqsPdXSzqXD0Nd/PyXFAAAxrWw X-MimeOLE: Produced By Microsoft MimeOLE V6.00.2900.5931 Date: Tue, 29 Mar 2011 16:02:45 +0530 Message-ID: <4dcd9b59488fe6eba7b2683a5f240b46@mail.gmail.com> Subject: RE: [PATCH] mfd: Fix usbhs_enable error handling To: Axel Lin , linux-kernel@vger.kernel.org Cc: Samuel Ortiz Content-Type: text/plain; charset=ISO-8859-1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1942 Lines: 63 > -----Original Message----- > From: Axel Lin [mailto:axel.lin@gmail.com] > Sent: Tuesday, March 29, 2011 3:38 PM > To: linux-kernel@vger.kernel.org > Cc: Keshava Munegowda; Samuel Ortiz > Subject: [PATCH] mfd: Fix usbhs_enable error handling > > In the case of missing platform_data we do not hold a spin_lock, > thus we should not call spin_unlock_irqrestore in the error path. > > Also simplify the error handling by separating the successful path > from error path. I think this change improves readability. > > Signed-off-by: Axel Lin > --- > drivers/mfd/omap-usb-host.c | 8 +++----- > 1 files changed, 3 insertions(+), 5 deletions(-) > > diff --git a/drivers/mfd/omap-usb-host.c b/drivers/mfd/omap-usb-host.c > index cb01209..4157d76 100644 > --- a/drivers/mfd/omap-usb-host.c > +++ b/drivers/mfd/omap-usb-host.c > @@ -700,8 +700,7 @@ static int usbhs_enable(struct device *dev) > dev_dbg(dev, "starting TI HSUSB Controller\n"); > if (!pdata) { > dev_dbg(dev, "missing platform_data\n"); > - ret = -ENODEV; > - goto end_enable; > + return -ENODEV; > } > > spin_lock_irqsave(&omap->lock, flags); > @@ -915,7 +914,8 @@ static int usbhs_enable(struct device *dev) > > end_count: > omap->count++; > - goto end_enable; > + spin_unlock_irqrestore(&omap->lock, flags); > + return 0; > > err_tll: > if (pdata->ehci_data->phy_reset) { > @@ -931,8 +931,6 @@ err_tll: > clk_disable(omap->usbhost_fs_fck); > clk_disable(omap->usbhost_hs_fck); > clk_disable(omap->usbhost_ick); > - > -end_enable: > spin_unlock_irqrestore(&omap->lock, flags); > return ret; > } > -- > 1.7.1 > > Thanks Axel! Acked-by: Keshava Munegowda < keshava_mgowda@ti.com> -- 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/