Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 7710
b: refs/heads/master
c: 1ccb48b
h: refs/heads/master
v: v3
  • Loading branch information
akpm@osdl.org authored and James Bottomley committed Aug 28, 2005
1 parent b2ead3a commit 12f4e01
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 84743bbcf9fc3767aa33f769898432538281e6dc
refs/heads/master: 1ccb48bb163853c24840c0a50c2a6df1affe029c
5 changes: 3 additions & 2 deletions trunk/drivers/scsi/scsi_lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -336,14 +336,15 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd,
struct scsi_sense_hdr *sshdr, int timeout, int retries)
{
char *sense = NULL;

int result;

if (sshdr) {
sense = kmalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
if (!sense)
return DRIVER_ERROR << 24;
memset(sense, 0, sizeof(*sense));
}
int result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,
result = scsi_execute(sdev, cmd, data_direction, buffer, bufflen,
sense, timeout, retries, 0);
if (sshdr)
scsi_normalize_sense(sense, sizeof(*sense), sshdr);
Expand Down

0 comments on commit 12f4e01

Please sign in to comment.