diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 16:45:00 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-13 16:45:00 -0500 |
| commit | 4ba529a8a39e15688b6a3d31b11930d1f8a1edad (patch) | |
| tree | 4a57f09fd8b96f1eb5f87f52fd0862db49f29e31 /drivers/scsi/libata-scsi.c | |
| parent | 41866a56cc4e676240b94ed8eaeca375aaef7496 (diff) | |
| parent | dcc2d1e7f0acf7d3f7ae632a73cd5f828ef9de20 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index 261be24e1df3..0df4b682965d 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c | |||
| @@ -2276,6 +2276,12 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) | |||
| 2276 | tf->device = scsicmd[8]; | 2276 | tf->device = scsicmd[8]; |
| 2277 | tf->command = scsicmd[9]; | 2277 | tf->command = scsicmd[9]; |
| 2278 | } | 2278 | } |
| 2279 | /* | ||
| 2280 | * If slave is possible, enforce correct master/slave bit | ||
| 2281 | */ | ||
| 2282 | if (qc->ap->flags & ATA_FLAG_SLAVE_POSS) | ||
| 2283 | tf->device = qc->dev->devno ? | ||
| 2284 | tf->device | ATA_DEV1 : tf->device & ~ATA_DEV1; | ||
| 2279 | 2285 | ||
| 2280 | /* | 2286 | /* |
| 2281 | * Filter SET_FEATURES - XFER MODE command -- otherwise, | 2287 | * Filter SET_FEATURES - XFER MODE command -- otherwise, |