From 31a5ef240e6bfb55764512104854d5d1ea345882 Mon Sep 17 00:00:00 2001 From: Alexander Usyskin Date: Thu, 6 Mar 2014 23:53:53 +0200 Subject: mei: fix regressions caused by removing ext_msg 1. Delete cb from list before freeing it 2. Fix missed break that leads to switch case fall-through and BUG invocation. Regression from: commit 6bb948c9e500d24321c36c67c81daf8d1a7e561e mei: get rid of ext_msg Signed-off-by: Alexander Usyskin Signed-off-by: Tomas Winkler Signed-off-by: Greg Kroah-Hartman --- drivers/misc/mei/interrupt.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers/misc/mei/interrupt.c') diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c index 5aab335f585b..2fbf0c0625ed 100644 --- a/drivers/misc/mei/interrupt.c +++ b/drivers/misc/mei/interrupt.c @@ -187,6 +187,7 @@ static int mei_cl_irq_disconnect_rsp(struct mei_cl *cl, struct mei_cl_cb *cb, cl->state = MEI_FILE_DISCONNECTED; cl->status = 0; + list_del(&cb->list); mei_io_cb_free(cb); return ret; @@ -522,6 +523,7 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list) ret = mei_cl_irq_disconnect_rsp(cl, cb, cmpl_list); if (ret) return ret; + break; default: BUG(); } -- cgit v1.2.3