diff options
| author | Prarit Bhargava <prarit@redhat.com> | 2013-09-23 09:33:36 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-10-03 03:25:16 -0400 |
| commit | e82b89a6f19bae73fb064d1b3dd91fcefbb478f4 (patch) | |
| tree | df7d3fcff80cdb3dce5fe01ca3619828d8e0d1bb /arch/powerpc | |
| parent | 1cf389df090194a0976dc867b7fffe99d9d490cb (diff) | |
powerpc/vio: Fix modalias_show return values
modalias_show() should return an empty string on error, not -ENODEV.
This causes the following false and annoying error:
> find /sys/devices -name modalias -print0 | xargs -0 cat >/dev/null
cat: /sys/devices/vio/4000/modalias: No such device
cat: /sys/devices/vio/4001/modalias: No such device
cat: /sys/devices/vio/4002/modalias: No such device
cat: /sys/devices/vio/4004/modalias: No such device
cat: /sys/devices/vio/modalias: No such device
Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
CC: <stable@vger.kernel.org>
Diffstat (limited to 'arch/powerpc')
| -rw-r--r-- | arch/powerpc/kernel/vio.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/vio.c b/arch/powerpc/kernel/vio.c index 78a350670de3..d38cc08b16c7 100644 --- a/arch/powerpc/kernel/vio.c +++ b/arch/powerpc/kernel/vio.c | |||
| @@ -1530,11 +1530,15 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr, | |||
| 1530 | const char *cp; | 1530 | const char *cp; |
| 1531 | 1531 | ||
| 1532 | dn = dev->of_node; | 1532 | dn = dev->of_node; |
| 1533 | if (!dn) | 1533 | if (!dn) { |
| 1534 | return -ENODEV; | 1534 | strcat(buf, "\n"); |
| 1535 | return strlen(buf); | ||
| 1536 | } | ||
| 1535 | cp = of_get_property(dn, "compatible", NULL); | 1537 | cp = of_get_property(dn, "compatible", NULL); |
| 1536 | if (!cp) | 1538 | if (!cp) { |
| 1537 | return -ENODEV; | 1539 | strcat(buf, "\n"); |
| 1540 | return strlen(buf); | ||
| 1541 | } | ||
| 1538 | 1542 | ||
| 1539 | return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp); | 1543 | return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp); |
| 1540 | } | 1544 | } |