ehea: fix skb_frag_size typo

[pandora-kernel.git] / drivers / target / target_core_tmr.c

diff --git a/drivers/target/target_core_tmr.c b/drivers/target/target_core_tmr.c
index 532ce31..570b144 100644 (file)
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
@@ -255,6 +255,16 @@ static void core_tmr_drain_task_list(
                        atomic_read(&cmd->t_transport_stop),
                        atomic_read(&cmd->t_transport_sent));
 
+               /*
+                * If the command may be queued onto a workqueue cancel it now.
+                *
+                * This is equivalent to removal from the execute queue in the
+                * loop above, but we do it down here given that
+                * cancel_work_sync may block.
+                */
+               if (cmd->t_state == TRANSPORT_COMPLETE)
+                       cancel_work_sync(&cmd->work);
+
                spin_lock_irqsave(&cmd->t_state_lock, flags);
                target_stop_task(task, &flags);