diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2006-02-08 20:09:00 +0100 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2006-02-18 21:54:13 +0100 |
| commit | e30809fde59d591809f00caa1a4c960cca5916af (patch) | |
| tree | 370d85a6158e45db26edf233404ac70d290c618b /drivers | |
| parent | [PATCH] GFP_KERNEL allocations in atomic (auditsc) (diff) | |
| download | linux-e30809fde59d591809f00caa1a4c960cca5916af.tar.xz linux-e30809fde59d591809f00caa1a4c960cca5916af.zip | |
[PATCH] don't mangle INQUIRY if cmddt or evpd bits are set
sbp2.c mangles INQUIRY response in a way that only applies to standard
inquiry data (i.e. when both cmddt and evpd bits are 0). Leave other cases
alone; e.g. when asking for VPD the length of reply is in byte 3, not 4
and byte 4 is the first byte of device serial number.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ieee1394/sbp2.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/drivers/ieee1394/sbp2.c b/drivers/ieee1394/sbp2.c index 18d7eda38851..c2c776fbda01 100644 --- a/drivers/ieee1394/sbp2.c +++ b/drivers/ieee1394/sbp2.c @@ -2082,9 +2082,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, SBP2_DEBUG("sbp2_check_sbp2_response"); - switch (SCpnt->cmnd[0]) { - - case INQUIRY: + if (SCpnt->cmnd[0] == INQUIRY && (SCpnt->cmnd[1] & 3) == 0) { /* * Make sure data length is ok. Minimum length is 36 bytes */ @@ -2097,13 +2095,7 @@ static void sbp2_check_sbp2_response(struct scsi_id_instance_data *scsi_id, */ scsi_buf[2] |= 2; scsi_buf[3] = (scsi_buf[3] & 0xf0) | 2; - - break; - - default: - break; } - return; } /* |