From 2934162ac5220304ad050c2449c64b3def1e3ffb Mon Sep 17 00:00:00 2001 From: Kuninori Morimoto Date: Wed, 10 Oct 2012 23:32:36 -0700 Subject: [PATCH] --- yaml --- r: 347042 b: refs/heads/master c: b53f4baf8b26303fc75ef3b00cf5e7398b58efd4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/i2c/busses/i2c-rcar.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 47232d933a62..75f603504138 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cf7505ef9cd1349dfff0b2aeb9bc62f54c14e03d +refs/heads/master: b53f4baf8b26303fc75ef3b00cf5e7398b58efd4 diff --git a/trunk/drivers/i2c/busses/i2c-rcar.c b/trunk/drivers/i2c/busses/i2c-rcar.c index f9399d163af2..2bce56de39e4 100644 --- a/trunk/drivers/i2c/busses/i2c-rcar.c +++ b/trunk/drivers/i2c/busses/i2c-rcar.c @@ -642,7 +642,7 @@ static int __devinit rcar_i2c_probe(struct platform_device *pdev) if (ret < 0) return ret; - priv->io = devm_ioremap(dev, res->start, resource_size(res)); + priv->io = devm_request_and_ioremap(dev, res); if (!priv->io) { dev_err(dev, "cannot ioremap\n"); return -ENODEV;