X-Git-Url: https://git.karo-electronics.de/?a=blobdiff_plain;f=drivers%2Fata%2Flibata-core.c;h=88e2dd0983b536cc31c3dfd6d44ffafa1f2854fc;hb=c6e54a578133fb353a50fb44d650768b3b9eb18e;hp=e127b73e32a4230ea87d318d03fba6c79c35e0d2;hpb=e04b3b9d03477781eff068957a9abfc92ffc4f59;p=karo-tx-linux.git 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) if ((slave_possible) && (err != 0x81)) ap->device[1].class = ata_dev_try_classify(ap, 1, &err); - /* re-enable interrupts */ - ap->ops->irq_on(ap); - /* is double-select really necessary? */ if (ap->device[1].class != ATA_DEV_NONE) ap->ops->dev_select(ap, 1); @@ -3551,10 +3548,6 @@ void ata_std_postreset(struct ata_port *ap, unsigned int *classes) if (sata_scr_read(ap, SCR_ERROR, &serror) == 0) sata_scr_write(ap, SCR_ERROR, serror); - /* re-enable interrupts */ - if (!ap->ops->error_handler) - ap->ops->irq_on(ap); - /* is double-select really necessary? */ if (classes[0] != ATA_DEV_NONE) ap->ops->dev_select(ap, 1);