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 15:05:54 +0200 Message-ID: <20100325130554.GE4964@nokia.com> References: <1269515673-27980-1-git-send-email-felipe.balbi@nokia.com> <1269515673-27980-11-git-send-email-felipe.balbi@nokia.com> <5A47E75E594F054BAF48C5E4FC4B92AB032221AF79@dbde02.ent.ti.com> Reply-To: felipe.balbi@nokia.com Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Return-path: Received: from smtp.nokia.com ([192.100.122.230]:25798 "EHLO mgw-mx03.nokia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475Ab0CYNG5 (ORCPT ); Thu, 25 Mar 2010 09:06:57 -0400 Content-Disposition: inline In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB032221AF79@dbde02.ent.ti.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: "ext Gadiyar, Anand" Cc: "Balbi Felipe (Nokia-D/Helsinki)" , Greg KH , Linux USB Mailing List , Linux OMAP Mailing List , Sergei Shtylyov On Thu, Mar 25, 2010 at 01:34:25PM +0100, ext Gadiyar, Anand wrote: >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 mispalced and now incorrect 'goto's in musb_init_controller(). >> >> Signed-off-by: Sergei Shtylyov >> Signed-off-by: Felipe Balbi > >This one doesn't apply for me. I'm on commit 01e7770 plus >gregkh-07-usb-2.6.34-rc1.patch. The first 9 patches apply correctly, >but this one fails on hunk 4 of 6. > >Felipe - are we on the same base here? > >Looking at gregkh-07-usb-2.6.34-rc1.patch, this hunk is already taken care >of there. I'm on today's Linus' tree. Greg's queue doesn't apply there. I tried v2.6.33, v2.6.34-rc1 and v2.6.34-rc2 tags also and couldn't get all patches to apply. -- balbi