1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 84ff203ffedd..152f4ff4ed7e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1051,6 +1051,14 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
                                                       &sshdr, SD_TIMEOUT,
                                                       SD_MAX_RETRIES);
 
+                        /*
+                         * If the drive has indicated to us that it
+                         * doesn't have any media in it, don't bother
+                         * with any more polling.
+                         */
+                        if (media_not_present(sdkp, &sshdr))
+                                return;
+
                         if (the_result)
                                 sense_valid = scsi_sense_valid(&sshdr);
                         retries++;
@@ -1059,14 +1067,6 @@ sd_spinup_disk(struct scsi_disk *sdkp, char *diskname)
                           ((driver_byte(the_result) & DRIVER_SENSE) &&
                           sense_valid && sshdr.sense_key == UNIT_ATTENTION)));
 
-                /*
-                 * If the drive has indicated to us that it doesn't have
-                 * any media in it, don't bother with any of the rest of
-                 * this crap.
-                 */
-                if (media_not_present(sdkp, &sshdr))
-                        return;
-
                 if ((driver_byte(the_result) & DRIVER_SENSE) == 0) {
                         /* no sense, TUR either succeeded or failed
                          * with a status error */