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 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
[pandora-kernel.git]
/
drivers
/
i2c
/
busses
/
i2c-s3c2410.c
diff --git
a/drivers/i2c/busses/i2c-s3c2410.c
b/drivers/i2c/busses/i2c-s3c2410.c
index
c772e02
..
1fac4e2
100644
(file)
--- a/
drivers/i2c/busses/i2c-s3c2410.c
+++ b/
drivers/i2c/busses/i2c-s3c2410.c
@@
-507,7
+507,7
@@
static int s3c24xx_i2c_doxfer(struct s3c24xx_i2c *i2c, struct i2c_msg *msgs, int
unsigned long timeout;
int ret;
- if (!
readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN
)
+ if (!
(readl(i2c->regs + S3C2410_IICCON) & S3C2410_IICCON_IRQEN)
)
return -EIO;
ret = s3c24xx_i2c_set_master(i2c);