public inbox for linux-omap@vger.kernel.org
 help / color / mirror / Atom feed
From: Felipe Balbi <felipe.balbi@nokia.com>
To: "ext Gadiyar, Anand" <gadiyar@ti.com>
Cc: "Balbi Felipe (Nokia-D/Helsinki)" <felipe.balbi@nokia.com>,
	Greg KH <greg@kroah.com>,
	Linux USB Mailing List <linux-usb@vger.kernel.org>,
	Linux OMAP Mailing List <linux-omap@vger.kernel.org>,
	Sergei Shtylyov <sshtylyov@ru.mvista.com>
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	[thread overview]
Message-ID: <20100325130554.GE4964@nokia.com> (raw)
In-Reply-To: <5A47E75E594F054BAF48C5E4FC4B92AB032221AF79@dbde02.ent.ti.com>

On Thu, Mar 25, 2010 at 01:34:25PM +0100, ext Gadiyar, Anand wrote:
>Felipe Balbi wrote:
>>
>> From: Sergei Shtylyov <sshtylyov@ru.mvista.com>
>>
>> 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 <sshtylyov@ru.mvista.com>
>> Signed-off-by: Felipe Balbi <felipe.balbi@nokia.com>
>
>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

  reply	other threads:[~2010-03-25 13:06 UTC|newest]

Thread overview: 28+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-25 11:14 [patch-2.6.34-rc2+ 00/11] musb patches (v2) Felipe Balbi
2010-03-25 11:14 ` [patch-2.6.34-rc2+ 03/11] MUSB: Blackfin: don't fake blackfin_interrupt() result Felipe Balbi
     [not found] ` <1269515673-27980-1-git-send-email-felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 01/11] musb: fix power field to hold all possible values Felipe Balbi
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 02/11] MUSB: fix DaVinci glue layer dependency Felipe Balbi
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 04/11] musb: save and restore missing bus control register Felipe Balbi
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 07/11] musb_core: don't prevent disabling clock on driver unload Felipe Balbi
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 10/11] musb_core: don't call musb_platform_exit() twice Felipe Balbi
2010-03-25 12:34     ` Gadiyar, Anand
2010-03-25 13:05       ` Felipe Balbi [this message]
2010-03-29 12:42         ` Gadiyar, Anand
2010-03-29 13:59           ` Felipe Balbi
2010-03-25 11:14   ` [patch-2.6.34-rc2+ 11/11] musb_core: fix musb_init_controller() error cleanup path Felipe Balbi
2010-04-23 21:08   ` [patch-2.6.34-rc2+ 00/11] musb patches (v2) Greg KH
2010-04-23 21:23     ` [PATCH] usb: Fix tusb6010 for DMA API (Re: [patch-2.6.34-rc2+ 00/11] musb patches (v2)) Tony Lindgren
     [not found]       ` <20100423212307.GY18272-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2010-04-23 22:08         ` Greg KH
2010-04-25 13:35           ` Felipe Balbi
2010-04-26 17:53             ` Tony Lindgren
     [not found]               ` <20100426175324.GE7225-4v6yS6AI5VpBDgjK7y7TUQ@public.gmane.org>
2010-04-26 19:02                 ` Greg KH
     [not found]                   ` <20100426190246.GA8772-U8xfFu+wG4EAvxtiuMwx3w@public.gmane.org>
2010-04-26 19:10                     ` Tony Lindgren
2010-04-26  3:59       ` Gadiyar, Anand
2010-03-25 11:14 ` [patch-2.6.34-rc2+ 05/11] musb: potential use after free Felipe Balbi
2010-03-25 11:14 ` [patch-2.6.34-rc2+ 06/11] musb_core: don't touch 'musb->clock' in musb_free() Felipe Balbi
2010-03-25 11:14 ` [patch-2.6.34-rc2+ 08/11] MUSB: DaVinci: fix musb_platform_init() error cleanup path Felipe Balbi
2010-03-25 11:14 ` [patch-2.6.34-rc2+ 09/11] MUSB: OMAP: don't call clk_put() Felipe Balbi
  -- strict thread matches above, loose matches on Subject: below --
2010-03-24 11:47 [patch-2.6.34-rc2+ 00/11] musb patches Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 10/11] musb_core: don't call musb_platform_exit() twice Felipe Balbi
     [not found]   ` <1269431279-22438-11-git-send-email-felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
2010-03-24 12:10     ` Sergei Shtylyov
2010-03-24 12:26       ` Sergei Shtylyov
     [not found]       ` <4BAA0122.2060402-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
2010-03-25  6:37         ` Felipe Balbi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20100325130554.GE4964@nokia.com \
    --to=felipe.balbi@nokia.com \
    --cc=gadiyar@ti.com \
    --cc=greg@kroah.com \
    --cc=linux-omap@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=sshtylyov@ru.mvista.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox