From 12bfd919488b2d76f3db4707b31e07fffed5969d Mon Sep 17 00:00:00 2001 From: Corentin Labbe Date: Fri, 17 Oct 2008 17:51:20 +0200 Subject: [PATCH] --- yaml --- r: 115545 b: refs/heads/master c: 366716e6aabfb6f7c65525cc1637e035bfaf422d h: refs/heads/master i: 115543: a16a8c73707d9531b698dd9161c4d26da2e35775 v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/adm1029.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 83a6c70dfdea..bc9f820e67b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d664a4809e73c878a43607d584b2e2b60fd07468 +refs/heads/master: 366716e6aabfb6f7c65525cc1637e035bfaf422d diff --git a/trunk/drivers/hwmon/adm1029.c b/trunk/drivers/hwmon/adm1029.c index ba84ca5923f9..36718150b475 100644 --- a/trunk/drivers/hwmon/adm1029.c +++ b/trunk/drivers/hwmon/adm1029.c @@ -179,7 +179,8 @@ show_fan(struct device *dev, struct device_attribute *devattr, char *buf) struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct adm1029_data *data = adm1029_update_device(dev); u16 val; - if (data->fan[attr->index] == 0 || data->fan_div[attr->index] == 0 + if (data->fan[attr->index] == 0 + || (data->fan_div[attr->index] & 0xC0) == 0 || data->fan[attr->index] == 255) { return sprintf(buf, "0\n"); } @@ -194,7 +195,7 @@ show_fan_div(struct device *dev, struct device_attribute *devattr, char *buf) { struct sensor_device_attribute *attr = to_sensor_dev_attr(devattr); struct adm1029_data *data = adm1029_update_device(dev); - if (data->fan_div[attr->index] == 0) + if ((data->fan_div[attr->index] & 0xC0) == 0) return sprintf(buf, "0\n"); return sprintf(buf, "%d\n", DIV_FROM_REG(data->fan_div[attr->index])); }