Merge branch 'linus' into tracing/ftrace

2 files changed, 2 insertions, 1 deletions

diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
index c772e02c2803..1fac4e233133 100644
--- 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);
diff --git a/drivers/i2c/busses/scx200_i2c.c b/drivers/i2c/busses/scx200_i2c.c
index c3022a023449..e4c98539c517 100644
--- a/drivers/i2c/busses/scx200_i2c.c
+++ b/drivers/i2c/busses/scx200_i2c.c
@@ -81,6 +81,7 @@ static struct i2c_algo_bit_data scx200_i2c_data = {
 
 static struct i2c_adapter scx200_i2c_ops = {
         .owner             = THIS_MODULE,
+        .class             = I2C_CLASS_HWMON | I2C_CLASS_SPD,
         .id                = I2C_HW_B_SCX200,
         .algo_data         = &scx200_i2c_data,
         .name   = "NatSemi SCx200 I2C",