aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelipe Balbi <balbi@ti.com>2013-03-29 20:46:27 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-03-29 23:53:06 -0400
commit19290816c5fa3f289465d24bfbac9d669cc2f061 (patch)
treea6130459eb9de6d711839b71bb6a927980071773
parentbb36668d5fe784600621d8fdce80f7c280f37a8a (diff)
usb: chipidea: core: switch over to devm_ioremap_resource
switch over to the newly added devm_ioremap_resource which provides more consistent error messages. Signed-off-by: Felipe Balbi <balbi@ti.com> Signed-off-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/chipidea/core.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/usb/chipidea/core.c b/drivers/usb/chipidea/core.c
index 77963b62c496..42f224936a8e 100644
--- a/drivers/usb/chipidea/core.c
+++ b/drivers/usb/chipidea/core.c
@@ -407,11 +407,9 @@ static int ci_hdrc_probe(struct platform_device *pdev)
407 return -ENODEV; 407 return -ENODEV;
408 } 408 }
409 409
410 base = devm_request_and_ioremap(dev, res); 410 base = devm_ioremap_resource(dev, res);
411 if (!base) { 411 if (IS_ERR(base))
412 dev_err(dev, "can't request and ioremap resource\n"); 412 return PTR_ERR(base);
413 return -ENOMEM;
414 }
415 413
416 ci = devm_kzalloc(dev, sizeof(*ci), GFP_KERNEL); 414 ci = devm_kzalloc(dev, sizeof(*ci), GFP_KERNEL);
417 if (!ci) { 415 if (!ci) {