diff options
| author | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:10:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2012-07-05 21:10:23 +0200 |
| commit | 90574ebb7e6e0f7f74636ee87315890ba88d6a4a (patch) | |
| tree | 5f60106dacbfe246f52aaaf9bac69dd4749f24a6 /drivers/scsi/sd.c | |
| parent | Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | perf/x86: Fix USER/KERNEL tagging of samples (diff) | |
| download | linux-90574ebb7e6e0f7f74636ee87315890ba88d6a4a.tar.xz linux-90574ebb7e6e0f7f74636ee87315890ba88d6a4a.zip | |
Merge branch 'perf/urgent' into perf/core
Merge this branch to pick up a fixlet and to update to a more recent base.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/scsi/sd.c')
| -rw-r--r-- | drivers/scsi/sd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6f0a4c612b3b..6f72b80121a0 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -1899,6 +1899,8 @@ static int sd_try_rc16_first(struct scsi_device *sdp) { if (sdp->host->max_cmd_len < 16) return 0; + if (sdp->try_rc_10_first) + return 0; if (sdp->scsi_level > SCSI_SPC_2) return 1; if (scsi_device_protection(sdp)) |