[PATCH 6/6] usb: chipidea: usbmisc: add post handling and errata fix for mx25
From: Michael Grzeschik <hidden>
Date: 2012-11-15 10:25:25
Also in:
linux-devicetree
On Thu, Nov 15, 2012 at 11:08:15AM +0100, Martin Fuzzey wrote:
On Wed, Nov 14, 2012 at 12:55 PM, Michael Grzeschik [off-list ref] wrote:quoted
@@ -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 |