diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-30 17:03:46 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-05-30 17:03:46 (GMT) |
| commit | 42fe55ce905212542426fa6407a76534a5fb696a (patch) | |
| tree | 874c5984e4222ea253b78c5be4755b3d31da54e2 /drivers/video/matrox/matroxfb_maven.c | |
| parent | 19ce0a995ff230b364c7329fd488c70e91c171d9 (diff) | |
| parent | 14674e70119ea01549ce593d8901a797f8a90f74 (diff) | |
| download | linux-fsl-qoriq-42fe55ce905212542426fa6407a76534a5fb696a.tar.xz | |
Merge branch 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging
Pull i2c updates from Jean Delvare.
* 'i2c-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
i2c: Split I2C_M_NOSTART support out of I2C_FUNC_PROTOCOL_MANGLING
i2c-dev: Add support for I2C_M_RECV_LEN
Diffstat (limited to 'drivers/video/matrox/matroxfb_maven.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_maven.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_maven.c b/drivers/video/matrox/matroxfb_maven.c index 31b8f67..217678e 100644 --- a/drivers/video/matrox/matroxfb_maven.c +++ b/drivers/video/matrox/matroxfb_maven.c @@ -1243,6 +1243,7 @@ static int maven_probe(struct i2c_client *client, if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_WRITE_WORD_DATA | I2C_FUNC_SMBUS_BYTE_DATA | + I2C_FUNC_NOSTART | I2C_FUNC_PROTOCOL_MANGLING)) goto ERROR0; if (!(data = kzalloc(sizeof(*data), GFP_KERNEL))) { |