Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

[pandora-kernel.git] / drivers / scsi / esp_scsi.c

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 182831e..394ed9e 100644 (file)
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -708,8 +708,7 @@ static void esp_maybe_execute_command(struct esp *esp)
        tp = &esp->target[tgt];
        lp = dev->hostdata;
 
-       list_del(&ent->list);
-       list_add(&ent->list, &esp->active_cmds);
+       list_move(&ent->list, &esp->active_cmds);
 
        esp->active_cmd = ent;
 
@@ -1244,8 +1243,7 @@ static int esp_finish_select(struct esp *esp)
                /* Now that the state is unwound properly, put back onto
                 * the issue queue.  This command is no longer active.
                 */
-               list_del(&ent->list);
-               list_add(&ent->list, &esp->queued_cmds);
+               list_move(&ent->list, &esp->queued_cmds);
                esp->active_cmd = NULL;
 
                /* Return value ignored by caller, it directly invokes