Skip to contentSkip to conversation

mei: nfc: clean nfc internal struct on host exit

PATCH Superseded Tomas Winkler 2 participants 3 messages Oct 7, 2014 – Nov 4, 2014

Subsystems (2)

v2 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mei: nfc: clean nfc internal struct on host exit

NFC internal structure cleaning was dropped by commit

commit 5ad1550a15cd5b75ed8aa3009e162822f720375e

Author: Tomas Winkler <[email protected]>
Date:   Sun Jan 26 11:53:06 2014 +0200

mei: Remove all bus devices from the mei_dev list when stopping the MEI

We allocate nfc_dev and free it across the reset so we do not keep it in dirty state

Stable: 3.15+

---
V2: allocate mei_nfc_dev dynamically

 drivers/misc/mei/bus.c     |  4 ++--
 drivers/misc/mei/mei_dev.h |  1 +
 drivers/misc/mei/nfc.c     | 53 +++++++++++++++++++++++++++++++++++++---------
 3 files changed, 46 insertions(+), 12 deletions(-)
drivers/misc/mei/bus.c +2 -2
index 4d20d60..b3a72bc 100644
@@ -140,7 +140,7 @@ static struct device_type mei_cl_device_type = {
 	.release	= mei_cl_dev_release,
 };
 
-static struct mei_cl *mei_bus_find_mei_cl_by_uuid(struct mei_device *dev,
+struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev,
 						uuid_le uuid)
 {
 	struct mei_cl *cl;
@@ -160,7 +160,7 @@ struct mei_cl_device *mei_cl_add_device(struct mei_device *dev,
 	struct mei_cl *cl;
 	int status;
 
-	cl = mei_bus_find_mei_cl_by_uuid(dev, uuid);
+	cl = mei_cl_bus_find_cl_by_uuid(dev, uuid);
 	if (cl == NULL)
 		return NULL;
 
drivers/misc/mei/mei_dev.h +1 -0
index 71744b1..1288a5c 100644
@@ -349,6 +349,7 @@ void mei_cl_bus_rx_event(struct mei_cl *cl);
 void mei_cl_bus_remove_devices(struct mei_device *dev);
 int mei_cl_bus_init(void);
 void mei_cl_bus_exit(void);
+struct mei_cl *mei_cl_bus_find_cl_by_uuid(struct mei_device *dev, uuid_le uuid);
 
 
 /**
drivers/misc/mei/nfc.c +43 -10

104 lines not on this page · raw message

Signature · 1 line
1.9.3
maintainer
#1 lore raw
Quoted 6 lines · Tomas Winkler

NFC internal structure cleaning was dropped by commit

commit 5ad1550a15cd5b75ed8aa3009e162822f720375e

Author: Tomas Winkler <[email protected]>
Date:   Sun Jan 26 11:53:06 2014 +0200
Quoted 6 lines

mei: Remove all bus devices from the mei_dev list when stopping the MEI

We allocate nfc_dev and free it across the reset
so we do not keep it in dirty state

Stable: 3.15+

Please read Documentation/stable_kernel_rules.txt for how to do this properly.

Please resend, after really verifying this does need to go to the stable trees...

thanks,

greg k-h

#2 lore raw
Quoted 5 lines
Quoted 2 lines

Stable: 3.15+

Please read Documentation/stable_kernel_rules.txt for how to do this properly.

Oops, this is my internal tracking it should be replaced with proper cc to stable, need to fix my scripts.

Quoted 2 lines

Please resend, after really verifying this does need to go to the stable trees...

Ok
Tomas