diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-04 02:34:14 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-04 02:34:14 +0100 |
| commit | 4ef679e6caf1261b6380a610a705a90d7e2738c6 (patch) | |
| tree | 6b59360c267508647ae4492f171668ef6ce82e32 /drivers/scsi/libata-scsi.c | |
| parent | [PATCH] mark several libata datastructures const (diff) | |
| parent | [PATCH] libata: fix ata_scsi_pass_thru error handling (diff) | |
| download | linux-4ef679e6caf1261b6380a610a705a90d7e2738c6.tar.xz linux-4ef679e6caf1261b6380a610a705a90d7e2738c6.zip | |
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/scsi/libata-scsi.c')
| -rw-r--r-- | drivers/scsi/libata-scsi.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/scsi/libata-scsi.c b/drivers/scsi/libata-scsi.c index b21b8854072e..ef763ed9a0e5 100644 --- a/drivers/scsi/libata-scsi.c +++ b/drivers/scsi/libata-scsi.c @@ -2239,7 +2239,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) struct scsi_cmnd *cmd = qc->scsicmd; if ((tf->protocol = ata_scsi_map_proto(scsicmd[1])) == ATA_PROT_UNKNOWN) - return 1; + goto invalid_fld; /* * 12 and 16 byte CDBs use different offsets to @@ -2301,7 +2301,7 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) */ if ((tf->command == ATA_CMD_SET_FEATURES) && (tf->feature == SETFEATURES_XFER)) - return 1; + goto invalid_fld; /* * Set flags so that all registers will be written, @@ -2322,6 +2322,11 @@ ata_scsi_pass_thru(struct ata_queued_cmd *qc, const u8 *scsicmd) qc->nsect = cmd->bufflen / ATA_SECT_SIZE; return 0; + + invalid_fld: + ata_scsi_set_sense(qc->scsicmd, ILLEGAL_REQUEST, 0x24, 0x00); + /* "Invalid field in cdb" */ + return 1; } /** |