From: mgr@pengutronix.de (Michael Grzeschik)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] usb: chipidea: usbmisc: add post handling and errata fix for mx25
Date: Thu, 15 Nov 2012 11:25:25 +0100 [thread overview]
Message-ID: <20121115102525.GA16118@pengutronix.de> (raw)
In-Reply-To: <CALBypN6U=np93ZwnEZqbh=j0Vb_-x630GaktEiv+4K26eYp4Pg@mail.gmail.com>
On Thu, Nov 15, 2012 at 11:08:15AM +0100, Martin Fuzzey wrote:
> On Wed, Nov 14, 2012 at 12:55 PM, Michael Grzeschik
> <m.grzeschik@pengutronix.de> wrote:
> > @@ -213,6 +216,15 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev)
> > goto put_np;
> > }
> >
> > + if (usbmisc_ops && usbmisc_ops->post) {
> > + ret = usbmisc_ops->post(&pdev->dev);
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "usbmisc post failed, ret=%d\n", ret);
> > + goto err;
> > + }
> > + }
> > +
> > data->ci_pdev = plat_ci;
> > platform_set_drvdata(pdev, data);
> >
> This hunk fails to apply for me on 3.7-rc5:
> error: while searching for:
> goto put_np;
> }
This is because that series is based on Peter Chen's work. I should have
mentioned this in the cover-letter mail. You can merge his master branch
before adding my series:
https://github.com/hzpeterchen/linux-usb.git
Apart from the latter patches, his work already got queued up by Greg:
http://comments.gmane.org/gmane.linux.usb.general/74537
Thanks,
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
WARNING: multiple messages have this Message-ID (diff)
From: Michael Grzeschik <mgr-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>
To: Martin Fuzzey <mfuzzey-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
Cc: Michael Grzeschik
<m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org>,
linux-usb-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org,
alexander.shishkin-VuQAYsv1563Yd54FQh9/CA@public.gmane.org,
mkl-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
gregkh-hQyY1W1yCW8ekmWlsbkhG0B+6BGkLq7r@public.gmane.org,
fabio.estevam-KZfg59tc24xl57MIdRCFDg@public.gmane.org,
kernel-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org,
devicetree-discuss-uLR06cmDAlY/bJ5BZ2RsiQ@public.gmane.org
Subject: Re: [PATCH 6/6] usb: chipidea: usbmisc: add post handling and errata fix for mx25
Date: Thu, 15 Nov 2012 11:25:25 +0100 [thread overview]
Message-ID: <20121115102525.GA16118@pengutronix.de> (raw)
In-Reply-To: <CALBypN6U=np93ZwnEZqbh=j0Vb_-x630GaktEiv+4K26eYp4Pg-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org>
On Thu, Nov 15, 2012 at 11:08:15AM +0100, Martin Fuzzey wrote:
> On Wed, Nov 14, 2012 at 12:55 PM, Michael Grzeschik
> <m.grzeschik-bIcnvbaLZ9MEGnE8C9+IrQ@public.gmane.org> wrote:
> > @@ -213,6 +216,15 @@ static int __devinit ci13xxx_imx_probe(struct platform_device *pdev)
> > goto put_np;
> > }
> >
> > + if (usbmisc_ops && usbmisc_ops->post) {
> > + ret = usbmisc_ops->post(&pdev->dev);
> > + if (ret) {
> > + dev_err(&pdev->dev,
> > + "usbmisc post failed, ret=%d\n", ret);
> > + goto err;
> > + }
> > + }
> > +
> > data->ci_pdev = plat_ci;
> > platform_set_drvdata(pdev, data);
> >
> This hunk fails to apply for me on 3.7-rc5:
> error: while searching for:
> goto put_np;
> }
This is because that series is based on Peter Chen's work. I should have
mentioned this in the cover-letter mail. You can merge his master branch
before adding my series:
https://github.com/hzpeterchen/linux-usb.git
Apart from the latter patches, his work already got queued up by Greg:
http://comments.gmane.org/gmane.linux.usb.general/74537
Thanks,
Michael
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
--
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
next prev parent reply other threads:[~2012-11-15 10:25 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 11:55 [PATCH 0/6] support other fsl SoCs with usbmisc + small fixes Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 11:55 ` [PATCH 1/6] usb: chipidea: usbmisc: unset global varibale usbmisc on driver remove Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 13:22 ` Alexander Shishkin
2012-11-14 13:22 ` Alexander Shishkin
2012-11-14 11:55 ` [PATCH 2/6] usb: chipidea: usbmisc: rename file, struct and functions to usbmisc_imx Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 11:57 ` Fabio Estevam
2012-11-14 11:57 ` Fabio Estevam
2012-11-14 15:32 ` Michael Grzeschik
2012-11-14 15:32 ` Michael Grzeschik
2012-11-14 13:25 ` Alexander Shishkin
2012-11-14 13:25 ` Alexander Shishkin
2012-11-14 13:28 ` Michael Grzeschik
2012-11-14 13:28 ` Michael Grzeschik
2012-11-14 13:32 ` Alexander Shishkin
2012-11-14 13:32 ` Alexander Shishkin
2012-11-14 11:55 ` [PATCH 3/6] usb: chipidea: usbmisc: prepare driver to handle more than one soc Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 11:55 ` [PATCH 4/6] usb: chipidea: usbmisc: add support for ahb, ipg and per clock Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 13:39 ` Alexander Shishkin
2012-11-14 13:39 ` Alexander Shishkin
2012-11-14 15:27 ` Michael Grzeschik
2012-11-14 15:27 ` Michael Grzeschik
2012-11-14 11:55 ` [PATCH 5/6] usb: chipidea: usbmisc: add mx53 support Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-14 11:55 ` [PATCH 6/6] usb: chipidea: usbmisc: add post handling and errata fix for mx25 Michael Grzeschik
2012-11-14 11:55 ` Michael Grzeschik
2012-11-15 10:08 ` Martin Fuzzey
2012-11-15 10:08 ` Martin Fuzzey
2012-11-15 10:25 ` Michael Grzeschik [this message]
2012-11-15 10:25 ` Michael Grzeschik
2012-11-15 13:51 ` Martin Fuzzey
2012-11-15 13:51 ` Martin Fuzzey
2012-11-15 13:54 ` Marc Kleine-Budde
2012-11-15 13:54 ` Marc Kleine-Budde
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=20121115102525.GA16118@pengutronix.de \
--to=mgr@pengutronix.de \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.