1 files changed, 7 insertions, 4 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 477648801a65..755fc68b5374 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1634,11 +1634,14 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
         DPRINTK("ENTER\n");
 
         for (i = 0; i < ATA_MAX_DEVICES; i++) {
-                unsigned int action;
+                unsigned int action, readid_flags = 0;
 
                 dev = &ap->device[i];
                 action = ata_eh_dev_action(dev);
 
+                if (ehc->i.flags & ATA_EHI_DID_RESET)
+                        readid_flags |= ATA_READID_POSTRESET;
+
                 if (action & ATA_EH_REVALIDATE && ata_dev_ready(dev)) {
                         if (ata_port_offline(ap)) {
                                 rc = -EIO;
@@ -1646,8 +1649,7 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
                         }
 
                         ata_eh_about_to_do(ap, dev, ATA_EH_REVALIDATE);
-                        rc = ata_dev_revalidate(dev,
-                                        ehc->i.flags & ATA_EHI_DID_RESET);
+                        rc = ata_dev_revalidate(dev, readid_flags);
                         if (rc)
                                 break;
 
@@ -1665,7 +1667,8 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
                            ata_class_enabled(ehc->classes[dev->devno])) {
                         dev->class = ehc->classes[dev->devno];
 
-                        rc = ata_dev_read_id(dev, &dev->class, 1, dev->id);
+                        rc = ata_dev_read_id(dev, &dev->class, readid_flags,
+                                             dev->id);
                         if (rc == 0) {
                                 ehc->i.flags |= ATA_EHI_PRINTINFO;
                                 rc = ata_dev_configure(dev);