From: Sergei Shtylyov <sshtylyov@mvista.com>
To: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Felipe Balbi <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>
Subject: Re: [patch-2.6.34-rc2+ 10/11] musb_core: don't call musb_platform_exit() twice
Date: Wed, 24 Mar 2010 15:26:09 +0300 [thread overview]
Message-ID: <4BAA04E1.8090204@ru.mvista.com> (raw)
In-Reply-To: <4BAA0122.2060402@ru.mvista.com>
Hello, I 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 misplaced 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>
>> ---
>> 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?
Right, this is atop of the follwing patch from Greg's 2.6.35-rc1 queue:
http://www.kernel.org/pub/linux/kernel/people/gregkh/gregkh-2.6/patches/usb/usb-musb-add-debugfs-support.patch
So, the patch wouldn't apply in the Greg's usb.current series... :-/
WBR, Sergei
next prev parent reply other threads:[~2010-03-24 12:26 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-24 11:47 [patch-2.6.34-rc2+ 00/11] musb patches Felipe Balbi
[not found] ` <1269431279-22438-1-git-send-email-felipe.balbi-xNZwKgViW5gAvxtiuMwx3w@public.gmane.org>
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 01/11] musb: fix power field to hold all possible values Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 02/11] MUSB: fix DaVinci glue layer dependency Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 03/11] MUSB: Blackfin: don't fake blackfin_interrupt() result Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 08/11] MUSB: DaVinci: fix musb_platform_init() error cleanup path Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 09/11] MUSB: OMAP: don't call clk_put() Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 04/11] musb: save and restore missing bus control register Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 05/11] musb: potential use after free Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 06/11] musb_core: don't touch 'musb->clock' in musb_free() Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 07/11] musb_core: don't prevent disabling clock on driver unload 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 [this message]
[not found] ` <4BAA0122.2060402-hkdhdckH98+B+jHODAdFcQ@public.gmane.org>
2010-03-25 6:37 ` Felipe Balbi
2010-03-24 11:47 ` [patch-2.6.34-rc2+ 11/11] musb_core: fix musb_init_controller() error cleanup path Felipe Balbi
2010-03-24 12:16 ` Sergei Shtylyov
-- strict thread matches above, loose matches on Subject: below --
2010-03-25 11:14 [patch-2.6.34-rc2+ 00/11] musb patches (v2) 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+ 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
2010-03-29 12:42 ` Gadiyar, Anand
2010-03-29 13:59 ` 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=4BAA04E1.8090204@ru.mvista.com \
--to=sshtylyov@mvista.com \
--cc=felipe.balbi@nokia.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