esp_scsi: read status registers

A read to ESP_INTRPT will clear ESP_STATUS and ESP_SSTEP. So read
all status registers in one go to avoid losing information.

Reviewed-by: Paolo Bonzini <[email protected]>
Acked-by: David S. Miller <[email protected]>
Signed-off-by: Hannes Reinecke <[email protected]>
Signed-off-by: Christoph Hellwig <[email protected]>

diff --git a/drivers/scsi/esp_scsi.c b/drivers/scsi/esp_scsi.c
index 800ff3ea501d69efee463164d672520888f87639..7ebf2c7d17a4c3eb73c7aabe94c026aaba6bdd89 100644 (file)
--- a/drivers/scsi/esp_scsi.c
+++ b/drivers/scsi/esp_scsi.c
@@ -982,7 +982,6 @@ static int esp_check_spur_intr(struct esp *esp)
 
        default:
                if (!(esp->sreg & ESP_STAT_INTR)) {
-                       esp->ireg = esp_read8(ESP_INTRPT);
                        if (esp->ireg & ESP_INTR_SR)
                                return 1;
 
@@ -2056,7 +2055,12 @@ static void __esp_interrupt(struct esp *esp)
        int finish_reset, intr_done;
        u8 phase;
 
+       /*
+       * Once INTRPT is read STATUS and SSTEP are cleared.
+       */
        esp->sreg = esp_read8(ESP_STATUS);
+       esp->seqreg = esp_read8(ESP_SSTEP);
+       esp->ireg = esp_read8(ESP_INTRPT);
 
        if (esp->flags & ESP_FLAG_RESETTING) {
                finish_reset = 1;
@@ -2069,8 +2073,6 @@ static void __esp_interrupt(struct esp *esp)
                        return;
        }
 
-       esp->ireg = esp_read8(ESP_INTRPT);
-
        if (esp->ireg & ESP_INTR_SR)
                finish_reset = 1;