From 5b6dca29b416d8992d52d814aa4be5d7fc97799d Mon Sep 17 00:00:00 2001 From: Tomas Winkler Date: Thu, 23 Jul 2015 15:08:44 +0300 Subject: [PATCH] mei: bus: blacklist the nfc info client Blacklist nfc info client which is only used for retrieval of the NFC radio version Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/bus-fixup.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/misc/mei/bus-fixup.c b/drivers/misc/mei/bus-fixup.c index 865e33bcd226..696918a6fa4f 100644 --- a/drivers/misc/mei/bus-fixup.c +++ b/drivers/misc/mei/bus-fixup.c @@ -27,8 +27,23 @@ #include "mei_dev.h" #include "client.h" +#define MEI_UUID_NFC_INFO UUID_LE(0xd2de1625, 0x382d, 0x417d, \ + 0x48, 0xa4, 0xef, 0xab, 0xba, 0x8a, 0x12, 0x06) + #define MEI_UUID_ANY NULL_UUID_LE +/** + * blacklist - blacklist a client from the bus + * + * @cldev: me clients device + */ +static void blacklist(struct mei_cl_device *cldev) +{ + dev_dbg(&cldev->dev, "running hook %s on %pUl\n", + __func__, mei_me_cl_uuid(cldev->me_cl)); + cldev->do_match = 0; +} + struct mei_nfc_cmd { u8 command; u8 status; @@ -120,9 +135,7 @@ const uuid_le mei_nfc_guid = UUID_LE(0x0bb17a78, 0x2a8e, 0x4c50, 0x94, 0xd4, 0x50, 0x26, 0x67, 0x23, 0x77, 0x5c); -static const uuid_le mei_nfc_info_guid = UUID_LE(0xd2de1625, 0x382d, 0x417d, - 0x48, 0xa4, 0xef, 0xab, - 0xba, 0x8a, 0x12, 0x06); +static const uuid_le mei_nfc_info_guid = MEI_UUID_NFC_INFO; /* Vendors */ #define MEI_NFC_VENDOR_INSIDE 0x00 @@ -421,7 +434,9 @@ static struct mei_fixup { const uuid_le uuid; void (*hook)(struct mei_cl_device *cldev); -} mei_fixups[] = {}; +} mei_fixups[] = { + MEI_FIXUP(MEI_UUID_NFC_INFO, blacklist), +}; /** * mei_cl_dev_fixup - run fixup handlers -- 2.30.2