diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-02-21 19:16:55 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-02-22 13:07:30 +0400 |
| commit | edb15d83a875a1f4b1576188844db5c330c3267d (patch) | |
| tree | 74d54eab401b6ccf2a6ad4821227108a8d160f03 /drivers/hwmon/tmp102.c | |
| parent | 8bfc245f9ad7bd4e461179e4e7852ef99b8b6144 (diff) | |
| parent | a0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff) | |
| download | linux-edb15d83a875a1f4b1576188844db5c330c3267d.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into mips-for-linux-next
Conflicts:
include/linux/ssb/ssb_driver_gige.h
Also resolves a logical merge conflict in drivers/net/ethernet/broadcom/-
bgmac.c due to change of an API.
Diffstat (limited to 'drivers/hwmon/tmp102.c')
| -rw-r--r-- | drivers/hwmon/tmp102.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/tmp102.c b/drivers/hwmon/tmp102.c index b10c3d36ccbc..523dd89ba498 100644 --- a/drivers/hwmon/tmp102.c +++ b/drivers/hwmon/tmp102.c @@ -115,7 +115,7 @@ static ssize_t tmp102_set_temp(struct device *dev, if (kstrtol(buf, 10, &val) < 0) return -EINVAL; - val = SENSORS_LIMIT(val, -256000, 255000); + val = clamp_val(val, -256000, 255000); mutex_lock(&tmp102->lock); tmp102->temp[sda->index] = val; |