diff options
author | Vladimir Zapolskiy <vz@mleia.com> | 2015-03-28 22:43:22 -0400 |
---|---|---|
committer | Felipe Balbi <balbi@ti.com> | 2015-04-27 15:38:34 -0400 |
commit | 49bce159fb3750eaf586c0b583a4930ca9db0d9c (patch) | |
tree | eb0e8819d5ed19d840ecbe4d78099348d1b98c04 /drivers/usb/gadget | |
parent | 228321904089b166a034711dd4f94dc657b39227 (diff) |
usb: gadget: xilinx: fix devm_ioremap_resource() check
devm_ioremap_resource() returns IOMEM_ERR_PTR() and it never
returns NULL, fix the check to prevent access to invalid
virtual address.
Signed-off-by: Vladimir Zapolskiy <vz@mleia.com>
Reviewed-by: Sören Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/udc/udc-xilinx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/gadget/udc/udc-xilinx.c b/drivers/usb/gadget/udc/udc-xilinx.c index dd3e9fd31b80..1f24274477ab 100644 --- a/drivers/usb/gadget/udc/udc-xilinx.c +++ b/drivers/usb/gadget/udc/udc-xilinx.c | |||
@@ -2071,8 +2071,8 @@ static int xudc_probe(struct platform_device *pdev) | |||
2071 | /* Map the registers */ | 2071 | /* Map the registers */ |
2072 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); | 2072 | res = platform_get_resource(pdev, IORESOURCE_MEM, 0); |
2073 | udc->addr = devm_ioremap_resource(&pdev->dev, res); | 2073 | udc->addr = devm_ioremap_resource(&pdev->dev, res); |
2074 | if (!udc->addr) | 2074 | if (IS_ERR(udc->addr)) |
2075 | return -ENOMEM; | 2075 | return PTR_ERR(udc->addr); |
2076 | 2076 | ||
2077 | irq = platform_get_irq(pdev, 0); | 2077 | irq = platform_get_irq(pdev, 0); |
2078 | if (irq < 0) { | 2078 | if (irq < 0) { |