path: root/drivers/misc/mei
diff options
authorLinus Torvalds <>2017-06-11 11:29:15 -0700
committerLinus Torvalds <>2017-06-11 11:29:15 -0700
commit9cd9cb0ba3e9e55120d25be3a45ffafd299b1b14 (patch)
tree3baad579419b1a9d0cf9c095fc6d050678232220 /drivers/misc/mei
parent21c9eb7ca32be43a1c6fcb8194cf2d1aea771772 (diff)
parented45509b550488f6a71a4b6cc5b12265e8c1f85d (diff)
Merge tag 'char-misc-4.12-rc5' of git://
Pull char/misc driver fixes from Greg KH: "Here are some small driver fixes for 4.12-rc5. Nothing major here, just some small bugfixes found by people testing, and a MAINTAINERS file update for the genwqe driver. All have been in linux-next with no reported issues" [ The cxl driver fix came in through the powerpc tree earlier ] * tag 'char-misc-4.12-rc5' of git:// cxl: Avoid double free_irq() for psl,slice interrupts mei: make sysfs modalias format similar as uevent modalias drivers: char: mem: Fix wraparound check to allow mappings up to the end MAINTAINERS: Change maintainer of genwqe driver goldfish_pipe: use GFP_ATOMIC under spin lock firmware: vpd: do not leak kobjects firmware: vpd: avoid potential use-after-free when destroying section firmware: vpd: do not leave freed section attributes to the list
Diffstat (limited to 'drivers/misc/mei')
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/misc/mei/bus.c b/drivers/misc/mei/bus.c
index d1928fdd0f43..07aad8576334 100644
--- a/drivers/misc/mei/bus.c
+++ b/drivers/misc/mei/bus.c
@@ -763,8 +763,10 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *a,
struct mei_cl_device *cldev = to_mei_cl_device(dev);
const uuid_le *uuid = mei_me_cl_uuid(cldev->me_cl);
+ u8 version = mei_me_cl_ver(cldev->me_cl);
- return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:", cldev->name, uuid);
+ return scnprintf(buf, PAGE_SIZE, "mei:%s:%pUl:%02X:",
+ cldev->name, uuid, version);
static DEVICE_ATTR_RO(modalias);