From: James Bottomley <James.Bottomley@suse.de>
Date: Thu, 23 Dec 2010 05:29:40 +0000 (-0600)
Subject: Merge branch 'block'
X-Git-Tag: MMI-PSA29.97-13-9~20997^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=ce82ba80477c2cf3576f1e42c4c377e9995633a7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'block'
---

ce82ba80477c2cf3576f1e42c4c377e9995633a7
diff --cc drivers/scsi/sd.c
index 365024b0c407,8d488a9fef00..b65e65aa07eb
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@@ -1043,16 -1045,9 +1043,8 @@@ static int sd_media_changed(struct gend
  					      sshdr);
  	}
  
- 	/*
- 	 * Unable to test, unit probably not ready.   This usually
- 	 * means there is no disc in the drive.  Mark as changed,
- 	 * and we will figure it out later once the drive is
- 	 * available again.
- 	 */
- 	if (retval || (scsi_sense_valid(sshdr) &&
- 		       /* 0x3a is medium not present */
- 		       sshdr->asc == 0x3a)) {
+ 	if (retval) {
  		set_media_not_present(sdkp);
 -		retval = 1;
  		goto out;
  	}