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 'next' into for-linus
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
input
/
touchscreen
/
ads7846.c
diff --git
a/drivers/input/touchscreen/ads7846.c
b/drivers/input/touchscreen/ads7846.c
index 04edc8f7122fa77d9c043694ba8f47d0c83dab0c..6c676e41fe3c3b418223497e62cfb33e0dee0637 100644
(file)
--- a/
drivers/input/touchscreen/ads7846.c
+++ b/
drivers/input/touchscreen/ads7846.c
@@
-529,10
+529,8
@@
static int ads784x_hwmon_register(struct spi_device *spi, struct ads7846 *ts)
ts->hwmon = hwmon_device_register_with_groups(&spi->dev, spi->modalias,
ts, ads7846_attr_groups);
ts->hwmon = hwmon_device_register_with_groups(&spi->dev, spi->modalias,
ts, ads7846_attr_groups);
- if (IS_ERR(ts->hwmon))
- return PTR_ERR(ts->hwmon);
- return
0
;
+ return
PTR_ERR_OR_ZERO(ts->hwmon)
;
}
static void ads784x_hwmon_unregister(struct spi_device *spi,
}
static void ads784x_hwmon_unregister(struct spi_device *spi,