diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-06-05 11:47:01 +0200 |
| commit | 40a2bc5b5c03c7219f40be1f5be51089a156b974 (patch) | |
| tree | b0f7a9bbf7b64727a0f1b35f70ead1a4d2809736 /p28.patch | |
| parent | 7d9e0d94f09501482a336a7a2e692c159ec4c9a9 (diff) | |
| download | patches-40a2bc5b5c03c7219f40be1f5be51089a156b974.tar.gz | |
refresh and move some patches out of the main queue
Diffstat (limited to 'p28.patch')
| -rw-r--r-- | p28.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/p28.patch b/p28.patch index a19fb142ba5dae..66a9ef27869dd3 100644 --- a/p28.patch +++ b/p28.patch @@ -12,7 +12,7 @@ static ssize_t name_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -406,6 +407,7 @@ static ssize_t name_show(struct device * +@@ -406,19 +407,22 @@ static ssize_t name_show(struct device * ofdev = to_platform_device(dev); return sprintf(buf, "%s\n", ofdev->dev.of_node->name); } @@ -20,9 +20,8 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, char *buf) -@@ -415,13 +417,15 @@ static ssize_t modalias_show(struct devi - buf[len+1] = 0; - return len+1; + { + return of_device_modalias(dev, buf, PAGE_SIZE); } +static DEVICE_ATTR_RO(modalias); @@ -41,7 +40,7 @@ struct bus_type ibmebus_bus_type = { .name = "ibmebus", -@@ -431,7 +435,7 @@ struct bus_type ibmebus_bus_type = { +@@ -428,7 +432,7 @@ struct bus_type ibmebus_bus_type = { .probe = ibmebus_bus_device_probe, .remove = ibmebus_bus_device_remove, .shutdown = ibmebus_bus_device_shutdown, |