On Fri, Sep 12, 2008 at 03:14:04PM +0300, Hiroshi DOYU wrote:
> From: "ext Felipe Balbi" <felipe.balbi@xxxxxxxxx>
> Subject: [patch] omap: usb: ehci: fix use of hcd->regs
> Date: Fri, 12 Sep 2008 15:10:24 +0300
>
> > hcd->regs should be initialized by ioremaping hcd->rsrc_start and
> > hcd->rsrc_len. Fix it for ehci-omap.c.
> >
> > Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
> > ---
> >
> > diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
> > index 8f122e5..a67533d 100644
> > --- a/drivers/usb/host/ehci-omap.c
> > +++ b/drivers/usb/host/ehci-omap.c
> > @@ -438,7 +438,7 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev)
> > hcd->rsrc_start = dev->resource[0].start;
> > hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
> >
> > - hcd->regs = (void __iomem *) (int) IO_ADDRESS(hcd->rsrc_start);
> > + hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
>
> Return value check?
Good one. Here's a new version:
===== cut here ====
From: Felipe Balbi <felipe.balbi@xxxxxxxxx>
Subject: [patch] omap: usb: ehci: fix usb of hcd->regs
hcd->regs should be initialized by ioremaping hcd->rsrc_start and
hcd->rsrc_len. Fix it for ehci-omap.c.
Signed-off-by: Felipe Balbi <felipe.balbi@xxxxxxxxx>
---
diff --git a/drivers/usb/host/ehci-omap.c b/drivers/usb/host/ehci-omap.c
index 8f122e5..4cafa79 100644
--- a/drivers/usb/host/ehci-omap.c
+++ b/drivers/usb/host/ehci-omap.c
@@ -438,7 +438,11 @@ static int ehci_hcd_omap_drv_probe(struct platform_device *dev)
hcd->rsrc_start = dev->resource[0].start;
hcd->rsrc_len = dev->resource[0].end - dev->resource[0].start + 1;
- hcd->regs = (void __iomem *) (int) IO_ADDRESS(hcd->rsrc_start);
+ hcd->regs = ioremap(hcd->rsrc_start, hcd->rsrc_len);
+ if (!hcd->regs) {
+ dev_err(&dev->dev, "ioremap failed\n");
+ return -ENOMEM;
+ }
ehci = hcd_to_ehci(hcd);
ehci->caps = hcd->regs;
--
balbi
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
