diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-28 10:29:07 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-28 10:29:07 +1000 |
| commit | 589ea74dc14aaf08d97f0079997fa7a57020d281 (patch) | |
| tree | 9cdec33fb086508f8b61973162a2c7cd19b1acee /drivers | |
| parent | f442a337043a9f027cb15249966299c749878473 (diff) | |
| parent | 83899dd5d3dceb8661c0f86eb32974ad3fcaf157 (diff) | |
Merge branch 'quilt/driver-core.current'
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/platform.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c index b5b6c973a2e0..d0743bcc9588 100644 --- a/drivers/base/platform.c +++ b/drivers/base/platform.c @@ -253,7 +253,8 @@ int platform_device_add(struct platform_device *pdev) * long time, so we allow the two cases coexist to make * this kind of fix more easily*/ if (pdev->platform_data && pdev->dev.platform_data) { - printk(KERN_ERR + if (pdev->platform_data != pdev->dev.platform_data) + printk(KERN_ERR "%s: use which platform_data?\n", dev_name(&pdev->dev)); } else if (pdev->platform_data) { @@ -1028,7 +1029,7 @@ static __initdata LIST_HEAD(early_platform_device_list); /** * early_platform_driver_register - * @edrv: early_platform driver structure + * @epdrv: early_platform driver structure * @buf: string passed from early_param() */ int __init early_platform_driver_register(struct early_platform_driver *epdrv, @@ -1112,7 +1113,7 @@ void __init early_platform_driver_register_all(char *class_str) /** * early_platform_match - * @edrv: early platform driver structure + * @epdrv: early platform driver structure * @id: id to match against */ static __init struct platform_device * @@ -1130,7 +1131,7 @@ early_platform_match(struct early_platform_driver *epdrv, int id) /** * early_platform_left - * @edrv: early platform driver structure + * @epdrv: early platform driver structure * @id: return true if id or above exists */ static __init int early_platform_left(struct early_platform_driver *epdrv, |