projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus-4.3' of git://git.kernel.org/pub/scm/linux/kernel/git/mason...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
hwmon
/
ntc_thermistor.c
diff --git
a/drivers/hwmon/ntc_thermistor.c
b/drivers/hwmon/ntc_thermistor.c
index dc0b76c5e3028018683b6a34c2c4f58c3906c650..feed30646d91837a5ea9ddab9e5ccd7e812ace47 100644
(file)
--- a/
drivers/hwmon/ntc_thermistor.c
+++ b/
drivers/hwmon/ntc_thermistor.c
@@
-477,7
+477,7
@@
static int ntc_thermistor_get_ohm(struct ntc_data *data)
return -EINVAL;
}
-static int ntc_read_temp(void *dev,
long
*temp)
+static int ntc_read_temp(void *dev,
int
*temp)
{
struct ntc_data *data = dev_get_drvdata(dev);
int ohm;