On Mon, 2014-05-19 at 23:35 +0300, Dan Carpenter wrote: > My previous patch introduced a bug which prevented this driver from > loading. devm_ioremap_resource() has a call to > devm_request_mem_region() which will fail because the address space is > shared between this PHY driver and CI device controller driver. > > Fixes: 10f0577aa5cb ('usb: phy: msm: change devm_ioremap() to devm_ioremap_resource()') > Reported-by:"Ivan T. Ivanov" <iivanov@xxxxxxxxxx> > Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx> > > diff --git a/drivers/usb/phy/phy-msm-usb.c b/drivers/usb/phy/phy-msm-usb.c > index 4f88174..ced34f3 100644 > --- a/drivers/usb/phy/phy-msm-usb.c > +++ b/drivers/usb/phy/phy-msm-usb.c > @@ -1586,9 +1586,11 @@ static int msm_otg_probe(struct platform_device *pdev) > np ? "alt_core" : "usb_hs_core_clk"); > > res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > - motg->regs = devm_ioremap_resource(&pdev->dev, res); > - if (IS_ERR(motg->regs)) > - return PTR_ERR(motg->regs); > + if (!res) > + return -EINVAL; > + motg->regs = devm_ioremap(&pdev->dev, res->start, resource_size(res)); > + if (!motg->regs) > + return -ENOMEM; Well, I don't think that your previous patch was merged anywhere. Or I am missing something? So you have to just made v3 of your original patch. Regards, Ivan -- To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html