git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-pca-platform.c
diff --git
a/drivers/i2c/busses/i2c-pca-platform.c
b/drivers/i2c/busses/i2c-pca-platform.c
index
9d75f51
..
6bb15ad
100644
(file)
--- a/
drivers/i2c/busses/i2c-pca-platform.c
+++ b/
drivers/i2c/busses/i2c-pca-platform.c
@@
-163,7
+163,7
@@
static int __devinit i2c_pca_pf_probe(struct platform_device *pdev)
i2c->reg_base = ioremap(res->start, res_len(res));
if (!i2c->reg_base) {
i2c->reg_base = ioremap(res->start, res_len(res));
if (!i2c->reg_base) {
- ret = -E
IO
;
+ ret = -E
NOMEM
;
goto e_remap;
}
i2c->io_base = res->start;
goto e_remap;
}
i2c->io_base = res->start;