Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

[linux-2.6-omap-h63xx.git] / drivers / scsi / eata_pio.c

diff --git a/drivers/scsi/eata_pio.c b/drivers/scsi/eata_pio.c
index 9579507f555bd46b582063ed63509682c1be41c2..952505c006dffeba8f13a3a5feb2d41d1575210e 100644 (file)
--- a/drivers/scsi/eata_pio.c
+++ b/drivers/scsi/eata_pio.c
@@ -369,7 +369,6 @@ static int eata_pio_queue(struct scsi_cmnd *cmd,
        cp = &hd->ccb[y];
 
        memset(cp, 0, sizeof(struct eata_ccb));
-       memset(cmd->sense_buffer, 0, sizeof(cmd->sense_buffer));
 
        cp->status = USED;      /* claim free slot */
 
@@ -816,8 +815,6 @@ static int register_pio_HBA(long base, struct get_conf *gc, struct pci_dev *pdev
        else
                hd->primary = 1;
 
-       sh->unchecked_isa_dma = 0;      /* We can only do PIO */
-
        hd->next = NULL;        /* build a linked list of all HBAs */
        hd->prev = last_HBA;
        if (hd->prev != NULL)