diff options
-rw-r--r-- | drivers/ata/libata-core.c | 7 | ||||
-rw-r--r-- | drivers/ata/pata_scc.c | 4 |
2 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c index e127b73e32a4..88e2dd0983b5 100644 --- a/drivers/ata/libata-core.c +++ b/drivers/ata/libata-core.c | |||
@@ -3164,9 +3164,6 @@ void ata_bus_reset(struct ata_port *ap) | |||
3164 | if ((slave_possible) && (err != 0x81)) | 3164 | if ((slave_possible) && (err != 0x81)) |
3165 | ap->device[1].class = ata_dev_try_classify(ap, 1, &err); | 3165 | ap->device[1].class = ata_dev_try_classify(ap, 1, &err); |
3166 | 3166 | ||
3167 | /* re-enable interrupts */ | ||
3168 | ap->ops->irq_on(ap); | ||
3169 | |||
3170 | /* is double-select really necessary? */ | 3167 | /* is double-select really necessary? */ |
3171 | if (ap->device[1].class != ATA_DEV_NONE) | 3168 | if (ap->device[1].class != ATA_DEV_NONE) |
3172 | ap->ops->dev_select(ap, 1); | 3169 | ap->ops->dev_select(ap, 1); |
@@ -3551,10 +3548,6 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes) | |||
3551 | if (sata_scr_read(ap, SCR_ERROR, &serror) == 0) | 3548 | if (sata_scr_read(ap, SCR_ERROR, &serror) == 0) |
3552 | sata_scr_write(ap, SCR_ERROR, serror); | 3549 | sata_scr_write(ap, SCR_ERROR, serror); |
3553 | 3550 | ||
3554 | /* re-enable interrupts */ | ||
3555 | if (!ap->ops->error_handler) | ||
3556 | ap->ops->irq_on(ap); | ||
3557 | |||
3558 | /* is double-select really necessary? */ | 3551 | /* is double-select really necessary? */ |
3559 | if (classes[0] != ATA_DEV_NONE) | 3552 | if (classes[0] != ATA_DEV_NONE) |
3560 | ap->ops->dev_select(ap, 1); | 3553 | ap->ops->dev_select(ap, 1); |
diff --git a/drivers/ata/pata_scc.c b/drivers/ata/pata_scc.c index 274fabfc90e1..c55667e0eb65 100644 --- a/drivers/ata/pata_scc.c +++ b/drivers/ata/pata_scc.c | |||
@@ -912,10 +912,6 @@ static void scc_std_postreset (struct ata_port *ap, unsigned int *classes) | |||
912 | { | 912 | { |
913 | DPRINTK("ENTER\n"); | 913 | DPRINTK("ENTER\n"); |
914 | 914 | ||
915 | /* re-enable interrupts */ | ||
916 | if (!ap->ops->error_handler) | ||
917 | ap->ops->irq_on(ap); | ||
918 | |||
919 | /* is double-select really necessary? */ | 915 | /* is double-select really necessary? */ |
920 | if (classes[0] != ATA_DEV_NONE) | 916 | if (classes[0] != ATA_DEV_NONE) |
921 | ap->ops->dev_select(ap, 1); | 917 | ap->ops->dev_select(ap, 1); |