summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/init.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-10-11 16:35:08 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-10-24 15:37:31 -0700
commit664df38b3c74656261d4227b4dd380cfa453f78f (patch)
tree35d05f657d0cd04d562edea962bc9122179caf64 /drivers/misc/mei/init.c
parent601a1efa630aab0ca72bf8d638c441a09654b250 (diff)
downloadlinux-3.10-664df38b3c74656261d4227b4dd380cfa453f78f.tar.gz
linux-3.10-664df38b3c74656261d4227b4dd380cfa453f78f.tar.bz2
linux-3.10-664df38b3c74656261d4227b4dd380cfa453f78f.zip
mei: use mei_io_cb_ warppers also for control flows
move the mei_io_cb_ wrappers to to iorw.c for global use and use them also for handling control flows Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/init.c')
-rw-r--r--drivers/misc/mei/init.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/misc/mei/init.c b/drivers/misc/mei/init.c
index 4666f0ba350..1f13eb97a10 100644
--- a/drivers/misc/mei/init.c
+++ b/drivers/misc/mei/init.c
@@ -668,12 +668,10 @@ int mei_disconnect_host_client(struct mei_device *dev, struct mei_cl *cl)
if (cl->state != MEI_FILE_DISCONNECTING)
return 0;
- cb = kzalloc(sizeof(struct mei_cl_cb), GFP_KERNEL);
+ cb = mei_io_cb_init(cl, NULL);
if (!cb)
return -ENOMEM;
- mei_io_list_init(cb);
- cb->file_private = cl;
cb->major_file_operations = MEI_CLOSE;
if (dev->mei_host_buffer_is_empty) {
dev->mei_host_buffer_is_empty = false;