AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

[ARM] 5011/1: htc-pasic3: fix bug in resource pipe-through to ds1wm

Browse Source 
The newly created DS1WM platform device should get a copy of the PASIC3
platform devices' resources.

Signed-off-by: Philipp Zabel <philipp.zabel@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
This commit is contained in:
Philipp Zabel 2008-04-20 17:42:59 +01:00 committed by Russell King
parent ee008b4cdf
commit 5826042d3c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/mfd/htc-pasic3.c
View File

@ -135,8 +135,9 @@ static struct ds1wm_platform_data ds1wm_pdata = {
.disable = ds1wm_disable, .disable = ds1wm_disable,
}; };
static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift) static int ds1wm_device_add(struct platform_device *pasic3_pdev, int bus_shift)
{ {
struct device *pasic3_dev = &pasic3_pdev->dev;
struct pasic3_data *asic = pasic3_dev->driver_data; struct pasic3_data *asic = pasic3_dev->driver_data;
struct platform_device *pdev; struct platform_device *pdev;
int ret; int ret;
@ -147,8 +148,8 @@ static int ds1wm_device_add(struct device *pasic3_dev, int bus_shift)
return -ENOMEM; return -ENOMEM;
} }
ret = platform_device_add_resources(pdev, pdev->resource, ret = platform_device_add_resources(pdev, pasic3_pdev->resource,
pdev->num_resources); pasic3_pdev->num_resources);
if (ret < 0) { if (ret < 0) {
dev_dbg(pasic3_dev, "failed to add DS1WM resources\n"); dev_dbg(pasic3_dev, "failed to add DS1WM resources\n");
goto exit_pdev_put; goto exit_pdev_put;
@ -210,7 +211,7 @@ static int __init pasic3_probe(struct platform_device *pdev)
return -ENOMEM; return -ENOMEM;
} }
ret = ds1wm_device_add(dev, asic->bus_shift); ret = ds1wm_device_add(pdev, asic->bus_shift);
if (ret < 0) if (ret < 0)
dev_warn(dev, "failed to register DS1WM\n"); dev_warn(dev, "failed to register DS1WM\n");