From: Prarit Bhargava <prarit@redhat.com>
Date: Thu, 3 Oct 2013 23:23:36 +0000 (-0400)
Subject: x86, wmi fix modalias_show return values
X-Git-Tag: firefly_0821_release~176^2~4886^2
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=a80e1053aaa395d94fff5ab7c73c89bb0c28c3c5;p=firefly-linux-kernel-4.4.55.git

x86, wmi fix modalias_show return values

I just fixed this same bug in arch/powerpc/kernel/vio.c and took a quick
look for other similar errors in the kernel.

modalias_show() should return an empty string on error, not errno.

Signed-off-by: Prarit Bhargava <prarit@redhat.com>
Cc: Matthew Garrett <matthew.garrett@nebula.com>
Signed-off-by: Matthew Garrett <matthew.garrett@nebula.com>
---

diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c
index 62e8c221d01e..c2e7b2657aeb 100644
--- a/drivers/platform/x86/wmi.c
+++ b/drivers/platform/x86/wmi.c
@@ -672,8 +672,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
 	struct wmi_block *wblock;
 
 	wblock = dev_get_drvdata(dev);
-	if (!wblock)
-		return -ENOMEM;
+	if (!wblock) {
+		strcat(buf, "\n");
+		return strlen(buf);
+	}
 
 	wmi_gtoa(wblock->gblock.guid, guid_string);