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

Merge tag 'v3.15-rc5' into next

Browse Source 
Merge with Linux 3.15-rc5 to sync up Wacom and other changes.
This commit is contained in:
Dmitry Torokhov
2014-05-14 16:49:19 -07:00
parent 70a26071f8 d6d211db37
commit 879f99ef2c
10865 changed files with 615446 additions and 256961 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -425,7 +425,7 @@ static int ads7845_read12_ser(struct device *dev, unsigned command)
name ## _show(struct device *dev, struct device_attribute *attr, char *buf) \
{ \
struct ads7846 *ts = dev_get_drvdata(dev); \
ssize_t v = ads7846_read12_ser(dev, \
ssize_t v = ads7846_read12_ser(&ts->spi->dev, \
READ_12BIT_SER(var)); \
if (v < 0) \
return v; \

3
drivers/input/touchscreen/st1232.c
View File

@@ -134,7 +134,8 @@ static irqreturn_t st1232_ts_irq_handler(int irq, void *dev_id)
} else if (!ts->low_latency_req.dev) {
/* First contact, request 100 us latency. */
dev_pm_qos_add_ancestor_request(&ts->client->dev,
&ts->low_latency_req, 100);
&ts->low_latency_req,
DEV_PM_QOS_RESUME_LATENCY, 100);
}
/* SYN_REPORT */