KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

gpio-button-hotplug: leave platform_device.dev.platform_data untouched

Browse source 
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>
This commit is contained in:
Furong Xu 2017-03-02 17:00:32 +08:00 committed by Hauke Mehrtens
parent e505f59bd9
commit 5a22df69e4
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
package/kernel/gpio-button-hotplug/src/gpio-button-hotplug.c
View file

@ -474,7 +474,6 @@ static int gpio_keys_button_probe(struct platform_device *pdev,
dev_err(dev, "missing platform data\n"); dev_err(dev, "missing platform data\n");
return -EINVAL; return -EINVAL;
} }
pdev->dev.platform_data = pdata;
} }
if (polled && !pdata->poll_interval) { if (polled && !pdata->poll_interval) {
@ -559,7 +558,7 @@ static int gpio_keys_probe(struct platform_device *pdev)
if (ret) if (ret)
return ret; return ret;
pdata = pdev->dev.platform_data; pdata = bdev->pdata;
for (i = 0; i < pdata->nbuttons; i++) { for (i = 0; i < pdata->nbuttons; i++) {
struct gpio_keys_button *button = &pdata->buttons[i]; struct gpio_keys_button *button = &pdata->buttons[i];
struct gpio_keys_button_data *bdata = &bdev->data[i]; struct gpio_keys_button_data *bdata = &bdev->data[i];