From 019d4b28b1692f212828a4d5335cdbdbad30e2dd Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Wed, 19 Dec 2012 22:17:00 +0100 Subject: [PATCH] --- yaml --- r: 347351 b: refs/heads/master c: 8f3c7c547d47bcfcf9ca2ed30b79733ce1e7ad3a h: refs/heads/master i: 347349: 0a582bda070d2865f9bbe9a02a4c3be1cbc38f98 347347: e264163ae57498d61f453d342a57e8d8297a8c12 347343: 4dec3a8bc8f07b39e76572f93d3788745e257954 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/w83627hf.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 70ac127731b3..73629996c604 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7e630bb55a52cfaa35011c0ebc2efc96f13e5135 +refs/heads/master: 8f3c7c547d47bcfcf9ca2ed30b79733ce1e7ad3a diff --git a/trunk/drivers/hwmon/w83627hf.c b/trunk/drivers/hwmon/w83627hf.c index 9170746e9743..81f486520cea 100644 --- a/trunk/drivers/hwmon/w83627hf.c +++ b/trunk/drivers/hwmon/w83627hf.c @@ -1732,8 +1732,10 @@ static void w83627hf_init_device(struct platform_device *pdev) /* Minimize conflicts with other winbond i2c-only clients... */ /* disable i2c subclients... how to disable main i2c client?? */ /* force i2c address to relatively uncommon address */ - w83627hf_write_value(data, W83781D_REG_I2C_SUBADDR, 0x89); - w83627hf_write_value(data, W83781D_REG_I2C_ADDR, force_i2c); + if (type == w83627hf) { + w83627hf_write_value(data, W83781D_REG_I2C_SUBADDR, 0x89); + w83627hf_write_value(data, W83781D_REG_I2C_ADDR, force_i2c); + } /* Read VID only once */ if (type == w83627hf || type == w83637hf) {