mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-04 08:08:54 +00:00
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>
This commit is contained in:
parent
1cf389df09
commit
e82b89a6f1
1 changed files with 8 additions and 4 deletions
|
@ -1530,11 +1530,15 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
|
||||||
const char *cp;
|
const char *cp;
|
||||||
|
|
||||||
dn = dev->of_node;
|
dn = dev->of_node;
|
||||||
if (!dn)
|
if (!dn) {
|
||||||
return -ENODEV;
|
strcat(buf, "\n");
|
||||||
|
return strlen(buf);
|
||||||
|
}
|
||||||
cp = of_get_property(dn, "compatible", NULL);
|
cp = of_get_property(dn, "compatible", NULL);
|
||||||
if (!cp)
|
if (!cp) {
|
||||||
return -ENODEV;
|
strcat(buf, "\n");
|
||||||
|
return strlen(buf);
|
||||||
|
}
|
||||||
|
|
||||||
return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
|
return sprintf(buf, "vio:T%sS%s\n", vio_dev->type, cp);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue