From 30061d9a3d6c181c61e1bba4c0abe486175057cf Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Tue, 9 Apr 2013 16:16:37 +0530 Subject: [PATCH] --- yaml --- r: 373247 b: refs/heads/master c: 651da3d4026ece555853694f51dbad566f113793 h: refs/heads/master i: 373245: 20de3041124ee2a4732c0a58ed86c687946cb823 373243: f848eac712fc800805cbcbf36c020ff005a4b82e 373239: fb11e0cf7167f0e092755730d5cc01d14cd9e856 373231: 82760ffb25a2bb02335faffa6afc0fd575dae1c0 373215: 08d6fa6949fd20c04f56f1876098ad9ccada0304 373183: b74b188d9ea6a84413d87291e877d60972dad2a3 373119: 5ff3cb243d31078696c14e3d6a9ba0c760105d0e 372991: f9d1bb153e0077a4bbc4f2fe32bb5bf07dc092a7 372735: 7fc7431e986c8692dde174b9897d473a271adc76 v: v3 --- [refs] | 2 +- trunk/drivers/mfd/omap-usb-tll.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b882c9a76f63..8730c6ad5ef4 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d011c450814eb6b5418c84dd0cac8b6eb99c42dc +refs/heads/master: 651da3d4026ece555853694f51dbad566f113793 diff --git a/trunk/drivers/mfd/omap-usb-tll.c b/trunk/drivers/mfd/omap-usb-tll.c index 8f4d5a1fcd1a..e59ac4cbac96 100644 --- a/trunk/drivers/mfd/omap-usb-tll.c +++ b/trunk/drivers/mfd/omap-usb-tll.c @@ -226,12 +226,9 @@ static int usbtll_omap_probe(struct platform_device *pdev) } res = platform_get_resource(pdev, IORESOURCE_MEM, 0); - tll->base = devm_request_and_ioremap(dev, res); - if (!tll->base) { - ret = -EADDRNOTAVAIL; - dev_err(dev, "Resource request/ioremap failed:%d\n", ret); - return ret; - } + tll->base = devm_ioremap_resource(dev, res); + if (IS_ERR(tll->base)) + return PTR_ERR(tll->base); platform_set_drvdata(pdev, tll); pm_runtime_enable(dev);