[libata] back out duplicated upstream fix

We already fixed this bug locally, so fix up the automerge
by removing the upstream change.

drivers/scsi/libata-scsi.c

@@ -273,8 +273,6 @@ static unsigned int ata_scsi_rw_xlat(struct ata_queued_cmd *qc, u8 *scsicmd)
 		tf->lbam = scsicmd[2];
 		tf->lbah = scsicmd[1] & 0x1f; /* mask out reserved bits */
 
-		tf->device |= ATA_LBA;
-
 		VPRINTK("six-byte command\n");
 		return 0;
 	}