Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Feb 2018 17:37:30 +0000 (09:37 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 1 Feb 2018 17:37:30 +0000 (09:37 -0800)
Pull small IDE cleanup from David Miller.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
  ide: remove duplicated assignment to 'cursg'

drivers/ide/ide-taskfile.c

index 4efe4c6e956cdd330025e57bc5bc2dfe60eeae7b..abe0822dd429efc0af32be4cec86c583bbf2ea46 100644 (file)
@@ -232,7 +232,6 @@ void ide_pio_bytes(ide_drive_t *drive, struct ide_cmd *cmd,
        unsigned int offset;
        u8 *buf;
 
-       cursg = cmd->cursg;
        if (cursg == NULL)
                cursg = cmd->cursg = sg;