2 files changed, 4 insertions, 10 deletions

diff --git a/drivers/misc/tifm_7xx1.c b/drivers/misc/tifm_7xx1.c
index 2ab7add78f94..50c4cdabb654 100644
--- a/drivers/misc/tifm_7xx1.c
+++ b/drivers/misc/tifm_7xx1.c
@@ -201,11 +201,12 @@ static void tifm_7xx1_insert_media(struct work_struct *work)
                                                        fm->max_sockets == 2);
                 if (media_id) {
                         ok_to_register = 0;
-                        new_sock = tifm_alloc_device(fm, cnt);
+                        new_sock = tifm_alloc_device(fm);
                         if (new_sock) {
                                 new_sock->addr = tifm_7xx1_sock_addr(fm->addr,
                                                                         cnt);
                                 new_sock->media_id = media_id;
+                                new_sock->socket_id = cnt;
                                 switch (media_id) {
                                 case 1:
                                         card_name = "xd";
diff --git a/drivers/misc/tifm_core.c b/drivers/misc/tifm_core.c
index d61df5c3ac36..21eb0ab7c329 100644
--- a/drivers/misc/tifm_core.c
+++ b/drivers/misc/tifm_core.c
@@ -141,24 +141,17 @@ EXPORT_SYMBOL(tifm_remove_adapter);
 void tifm_free_device(struct device *dev)
 {
         struct tifm_dev *fm_dev = container_of(dev, struct tifm_dev, dev);
-        if (fm_dev->wq)
-                destroy_workqueue(fm_dev->wq);
         kfree(fm_dev);
 }
 EXPORT_SYMBOL(tifm_free_device);
 
-struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm, unsigned int id)
+struct tifm_dev *tifm_alloc_device(struct tifm_adapter *fm)
 {
         struct tifm_dev *dev = kzalloc(sizeof(struct tifm_dev), GFP_KERNEL);
 
         if (dev) {
                 spin_lock_init(&dev->lock);
-                snprintf(dev->wq_name, KOBJ_NAME_LEN, "tifm%u:%u", fm->id, id);
-                dev->wq = create_singlethread_workqueue(dev->wq_name);
-                if (!dev->wq) {
-                        kfree(dev);
-                        return NULL;
-                }
+
                 dev->dev.parent = fm->dev;
                 dev->dev.bus = &tifm_bus_type;
                 dev->dev.release = tifm_free_device;