aboutsummaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorZhang Rui2014-01-14 16:46:38 +0800
committerRafael J. Wysocki2014-01-17 01:59:15 +0100
commitb9f73067f32531db608e469a9ad20ce631e34550 (patch)
treed3377f695cbdb34e9873846f8dbac79f883d5014 /drivers/base
parent8c4ff6d0094a16809a7ecdd49d71cf06b0a51326 (diff)
platform: introduce OF style 'modalias' support for platform bus
Fix a problem that, the platform bus supports the OF style modalias in .uevent() call, but not in its device 'modalias' sysfs attribute. Signed-off-by: Zhang Rui <rui.zhang@intel.com> Acked-by: Rob Herring <robh@kernel.org> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/base')
-rw-r--r--drivers/base/platform.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 2f4aea2428b2..bc78848dd59a 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -679,6 +679,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
struct platform_device *pdev = to_platform_device(dev);
int len;
+ len = of_device_get_modalias(dev, buf, PAGE_SIZE -1);
+ if (len != -ENODEV)
+ return len;
+
len = acpi_device_modalias(dev, buf, PAGE_SIZE -1);
if (len != -ENODEV)
return len;