aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFurong Xu <xfr@outlook.com>2017-03-02 17:00:32 +0800
committerHauke Mehrtens <hauke@hauke-m.de>2017-08-21 21:29:52 +0200
commit5a22df69e421246ba4653d3dd70d25d1aaa5d31c (patch)
tree02abd9b533f8d33695b1911c15b0ef9d0d94c3f2
parente505f59bd946a85c7eb8d5b19d796ed4d45218df (diff)
downloadupstream-5a22df69e421246ba4653d3dd70d25d1aaa5d31c.tar.gz
upstream-5a22df69e421246ba4653d3dd70d25d1aaa5d31c.tar.bz2
upstream-5a22df69e421246ba4653d3dd70d25d1aaa5d31c.zip
gpio-button-hotplug: leave platform_device.dev.platform_data untouched
get platform_data from gpio_keys_button_dev.pdata, and fix a illegal pointer dereference like this: [ 51.143776] gpio-keys-polled gpio-keys-polled: missing poll_interval value [ 51.150852] gpio-keys-polled: probe of gpio-keys-polled failed with error -22 [ 828.159993] gpio-keys-polled gpio-keys-polled: no memory for button data [ 828.166821] gpio-keys-polled: probe of gpio-keys-polled failed with error -12 Signed-off-by: Furong Xu <xfr@outlook.com>
-rw-r--r--package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
index 2bd3ff1813..1aef23e876 100644
--- a/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
+++ b/package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
@@ -474,7 +474,6 @@ static int gpio_keys_button_probe(struct platform_device *pdev,
dev_err(dev, "missing platform data\n");
return -EINVAL;
}
- pdev->dev.platform_data = pdata;
}
if (polled && !pdata->poll_interval) {
@@ -559,7 +558,7 @@ static int gpio_keys_probe(struct platform_device *pdev)
if (ret)
return ret;
- pdata = pdev->dev.platform_data;
+ pdata = bdev->pdata;
for (i = 0; i < pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i];