diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2013-11-19 19:23:06 -0500 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2013-11-19 19:23:06 -0500 |
| commit | df87effeedc3a8d21570c4b1cad6f84eff68abde (patch) | |
| tree | 1d3682bc086e828aa25d66ad03d513c2c405d6ab /drivers/scsi/sd.c | |
| parent | 492b96082c7baa1f750239d431a2ca38a5c4d5e5 (diff) | |
| parent | 4f99adb5d342eeb96dc8e13111cd08c6fa4ba43e (diff) | |
Merge tag 'v3.8.13.10' into v3.8-rt
v3.8.13.10
Conflicts:
mm/swap.c
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index a1dcdc3db28c..bc108d295be3 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -2421,14 +2421,9 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer) } } - if (modepage == 0x3F) { - sd_printk(KERN_ERR, sdkp, "No Caching mode page " - "present\n"); - goto defaults; - } else if ((buffer[offset] & 0x3f) != modepage) { - sd_printk(KERN_ERR, sdkp, "Got wrong page\n"); - goto defaults; - } + sd_printk(KERN_ERR, sdkp, "No Caching mode page found\n"); + goto defaults; + Page_found: if (modepage == 8) { sdkp->WCE = ((buffer[offset + 2] & 0x04) != 0); |