OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
47bb27e
)
i2c: nomadik: Don't use IS_ERR for devm_ioremap
author
Ulf Hansson
<ulf.hansson@linaro.org>
Thu, 10 Apr 2014 14:19:29 +0000
(16:19 +0200)
committer
Wolfram Sang
<wsa@the-dreams.de>
Wed, 14 May 2014 16:14:35 +0000
(18:14 +0200)
devm_ioremap() returns NULL on error, not an error.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
Cc: stable@kernel.org
drivers/i2c/busses/i2c-nomadik.c
patch
|
blob
|
history
diff --git
a/drivers/i2c/busses/i2c-nomadik.c
b/drivers/i2c/busses/i2c-nomadik.c
index
28cbe1b
..
32c85e9
100644
(file)
--- a/
drivers/i2c/busses/i2c-nomadik.c
+++ b/
drivers/i2c/busses/i2c-nomadik.c
@@
-999,7
+999,7
@@
static int nmk_i2c_probe(struct amba_device *adev, const struct amba_id *id)
dev->virtbase = devm_ioremap(&adev->dev, adev->res.start,
resource_size(&adev->res));
- if (
IS_ERR(dev->virtbase)
) {
+ if (
!dev->virtbase
) {
ret = -ENOMEM;
goto err_no_mem;
}