diff options
| author | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-12-02 13:37:41 +0000 |
| commit | e80b89ee2ace3a959c44c834231851fc5242eb13 (patch) | |
| tree | ec8cd7a9cd05002261fbfda9b4ea4f66d1e04f7b /drivers/platform/x86/wmi.c | |
| parent | 85cfe6b64d785b170367322d9d130a530db7b276 (diff) | |
| parent | dc1ccc48159d63eca5089e507c82c7d22ef60839 (diff) | |
Merge tag 'v3.13-rc2' into spi-rcar
Linux 3.13-rc2
Diffstat (limited to 'drivers/platform/x86/wmi.c')
| -rw-r--r-- | drivers/platform/x86/wmi.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/platform/x86/wmi.c b/drivers/platform/x86/wmi.c index 62e8c221d01..c2e7b2657ae 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); |