Merge branch 'for-linus' to bring in change ensuring that drivers that

[linux.git] / drivers / input / joystick / as5011.c

diff --git a/drivers/input/joystick/as5011.c b/drivers/input/joystick/as5011.c
index feeefcb09e78b1e6e0eb4792abdc77c740882741..c96653b58867deb406a13913774a7e35c074dec7 100644 (file)
--- a/drivers/input/joystick/as5011.c
+++ b/drivers/input/joystick/as5011.c
@@ -231,6 +231,7 @@ static int __devinit as5011_probe(struct i2c_client *client,
        }
 
        if (!i2c_check_functionality(client->adapter,
+                                    I2C_FUNC_NOSTART |
                                     I2C_FUNC_PROTOCOL_MANGLING)) {
                dev_err(&client->dev,
                        "need i2c bus that supports protocol mangling\n");