xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'next' into for-linus

Browse Source 
Prepare first round of input updates for 4.3 merge window.
This commit is contained in:
Dmitry Torokhov
2015-11-03 14:45:16 -08:00
parent 195562194a bf5f18d708
commit 84a73014d8
10278 changed files with 569062 additions and 258785 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/input/touchscreen/ads7846.c
View File

@@ -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);
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,