1 files changed, 13 insertions, 3 deletions

diff --git a/net/iucv/iucv.c b/net/iucv/iucv.c
index 3973d0e61e56..3b1f5f5f8de7 100644
--- a/net/iucv/iucv.c
+++ b/net/iucv/iucv.c
@@ -1768,7 +1768,6 @@ static void iucv_tasklet_fn(unsigned long ignored)
  */
 static void iucv_work_fn(struct work_struct *work)
 {
-        typedef void iucv_irq_fn(struct iucv_irq_data *);
         LIST_HEAD(work_queue);
         struct iucv_irq_list *p, *n;
 
@@ -1878,14 +1877,25 @@ int iucv_path_table_empty(void)
 static int iucv_pm_freeze(struct device *dev)
 {
         int cpu;
+        struct iucv_irq_list *p, *n;
         int rc = 0;
 
 #ifdef CONFIG_PM_DEBUG
         printk(KERN_WARNING "iucv_pm_freeze\n");
 #endif
+        if (iucv_pm_state != IUCV_PM_FREEZING) {
+                for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
+                        smp_call_function_single(cpu, iucv_block_cpu_almost,
+                                                 NULL, 1);
+                cancel_work_sync(&iucv_work);
+                list_for_each_entry_safe(p, n, &iucv_work_queue, list) {
+                        list_del_init(&p->list);
+                        iucv_sever_pathid(p->data.ippathid,
+                                          iucv_error_no_listener);
+                        kfree(p);
+                }
+        }
         iucv_pm_state = IUCV_PM_FREEZING;
-        for_each_cpu_mask_nr(cpu, iucv_irq_cpumask)
-                smp_call_function_single(cpu, iucv_block_cpu_almost, NULL, 1);
         if (dev->driver && dev->driver->pm && dev->driver->pm->freeze)
                 rc = dev->driver->pm->freeze(dev);
         if (iucv_path_table_empty())