From mboxrd@z Thu Jan 1 00:00:00 1970 From: Felipe Balbi Subject: Re: [patch-2.6.34-rc2+ 10/11] musb_core: don't call musb_platform_exit() twice Date: Thu, 25 Mar 2010 08:37:28 +0200 Message-ID: <20100325063728.GM29419@nokia.com> References: <1269431279-22438-1-git-send-email-felipe.balbi@nokia.com> <1269431279-22438-11-git-send-email-felipe.balbi@nokia.com> <4BAA0122.2060402@ru.mvista.com> Reply-To: felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Return-path: Content-Disposition: inline In-Reply-To: <4BAA0122.2060402-hkdhdckH98+B+jHODAdFcQ@public.gmane.org> Sender: linux-usb-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: ext Sergei Shtylyov Cc: "Balbi Felipe (Nokia-D/Helsinki)" , Greg KH , Linux USB Mailing List , Linux OMAP Mailing List List-Id: linux-omap@vger.kernel.org On Wed, Mar 24, 2010 at 01:10:10PM +0100, ext Sergei Shtylyov wrote: >Hello. > >Felipe Balbi wrote: > >> From: Sergei Shtylyov >> >> musb_platform_exit() is called twice from musb_init_controller() iff controller >> initialization fails. Move the call (and the DevCtl register writes surrounding >> it) from musb_free() to musb_remove(). >> >> Fix misplaced and now incorrect 'goto's in musb_init_controller(). >> >> Signed-off-by: Sergei Shtylyov >> Signed-off-by: Felipe Balbi >> --- >> drivers/usb/musb/musb_core.c | 17 +++++++---------- >> 1 files changed, 7 insertions(+), 10 deletions(-) >> >> diff --git a/drivers/usb/musb/musb_core.c b/drivers/usb/musb/musb_core.c >> index 827b813..90ac17b 100644 >> --- a/drivers/usb/musb/musb_core.c >> +++ b/drivers/usb/musb/musb_core.c >> >[...] >> @@ -2054,6 +2046,8 @@ bad_config: >> musb_readb(musb->mregs, MUSB_DEVCTL)); >> >> } >> + if (status < 0) >> + goto fail2; >> >> status = musb_init_debugfs(musb); >> if (status < 0) >> > > Hm, I don't see this call in the current driver -- are you sure >you've used the right tree? hmm, seems like I have rebased against the wrong Greg's queue, I'll fix that soon. Please ignore both series, it was a bug in my script. apoligies for that. -- balbi -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html