diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-07-26 13:28:47 -0700 |
| commit | 2d986010ad13a00b83851238d52601d6092df40e (patch) | |
| tree | 6a43ffd30290fc051435643d485ad12fb1448ed5 /drivers/scsi/libata-core.c | |
| parent | 6b6a93c6876ea1c530d5d3f68e3678093a27fab0 (diff) | |
| parent | e10fb91c4dc81a4ae47caf0828df152f600f2546 (diff) | |
| download | blackbird-obmc-linux-2d986010ad13a00b83851238d52601d6092df40e.tar.gz blackbird-obmc-linux-2d986010ad13a00b83851238d52601d6092df40e.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-for-linus-2.6
Diffstat (limited to 'drivers/scsi/libata-core.c')
| -rw-r--r-- | drivers/scsi/libata-core.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index cb535fa185b9..73b1f72b7e43 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c @@ -2866,7 +2866,7 @@ static void ata_qc_timeout(struct ata_queued_cmd *qc) if (qc->dev->class == ATA_DEV_ATAPI && qc->scsicmd) { struct scsi_cmnd *cmd = qc->scsicmd; - if (!scsi_eh_eflags_chk(cmd, SCSI_EH_CANCEL_CMD)) { + if (!(cmd->eh_eflags & SCSI_EH_CANCEL_CMD)) { /* finish completing original command */ __ata_qc_complete(qc); @@ -3750,7 +3750,7 @@ static void ata_host_init(struct ata_port *ap, struct Scsi_Host *host, host->max_channel = 1; host->unique_id = ata_unique_id++; host->max_cmd_len = 12; - scsi_set_device(host, ent->dev); + scsi_assign_lock(host, &host_set->lock); ap->flags = ATA_FLAG_PORT_DISABLED; |
