aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-05-26 14:02:30 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2017-05-26 14:02:30 -0700
commite2a9aa5ab2a4d1fb05fcdfa9661d54e437093297 (patch)
tree5161c6ad0ced049c1a72ae653d49d87aab6ae7cf /drivers
parent6741d51699ac9ef21f1fac14c63ecd31d3a7c278 (diff)
parentaace34c0bb8ea3c8bdcec865b6a4be4db0a68e33 (diff)
downloadleg-kernel-e2a9aa5ab2a4d1fb05fcdfa9661d54e437093297.tar.gz
Merge tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds
Pull LED fix from Jacek Anaszewski: "A single LED fix for 4.12-rc3. leds-pca955x driver uses only i2c_smbus API and thus it should pass I2C_FUNC_SMBUS_BYTE_DATA flag to i2c_check_functionality" * tag 'led_fixes_for_4-12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds: leds: pca955x: Correct I2C Functionality
Diffstat (limited to 'drivers')
-rw-r--r--drivers/leds/leds-pca955x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/leds/leds-pca955x.c b/drivers/leds/leds-pca955x.c
index 78a7ce816a47..9a873118ea5f 100644
--- a/drivers/leds/leds-pca955x.c
+++ b/drivers/leds/leds-pca955x.c
@@ -285,7 +285,7 @@ static int pca955x_probe(struct i2c_client *client,
"slave address 0x%02x\n",
client->name, chip->bits, client->addr);
- if (!i2c_check_functionality(adapter, I2C_FUNC_I2C))
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA))
return -EIO;
if (pdata) {