diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 18:57:09 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2007-01-10 18:57:09 -0500 |
| commit | 2d9819e3473f3e2200a4942760fa1f3d41043b99 (patch) | |
| tree | 02999d88756715d7c3cd23d4e20c6627472e69da /drivers | |
| parent | 40e38d30432a749b68d4c6e2038764ed1d3c846e (diff) | |
| parent | 1a74bc68e4c0534d150e6454b45a70dab831fa32 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
ieee1394: sbp2: fix probing of some DVD-ROM/RWs
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 2b5d7ab3adf7..4325aac7733d 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c | |||
| @@ -2020,6 +2020,8 @@ static int sbp2scsi_slave_configure(struct scsi_device *sdev) | |||
| 2020 | blk_queue_dma_alignment(sdev->request_queue, (512 - 1)); | 2020 | blk_queue_dma_alignment(sdev->request_queue, (512 - 1)); |
| 2021 | sdev->use_10_for_rw = 1; | 2021 | sdev->use_10_for_rw = 1; |
| 2022 | 2022 | ||
| 2023 | if (sdev->type == TYPE_ROM) | ||
| 2024 | sdev->use_10_for_ms = 1; | ||
| 2023 | if (sdev->type == TYPE_DISK && | 2025 | if (sdev->type == TYPE_DISK && |
| 2024 | lu->workarounds & SBP2_WORKAROUND_MODE_SENSE_8) | 2026 | lu->workarounds & SBP2_WORKAROUND_MODE_SENSE_8) |
| 2025 | sdev->skip_ms_page_8 = 1; | 2027 | sdev->skip_ms_page_8 = 1; |