summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakpm@osdl.org <akpm@osdl.org>2005-06-26 00:12:51 -0700
committerJames Bottomley <jejb@titanic.(none)>2005-08-28 11:34:09 -0500
commit1ccb48bb163853c24840c0a50c2a6df1affe029c (patch)
treedb7296e294cef3008140404e3047c3adce6f5149
parent84743bbcf9fc3767aa33f769898432538281e6dc (diff)
downloadop-kernel-dev-1ccb48bb163853c24840c0a50c2a6df1affe029c.zip
op-kernel-dev-1ccb48bb163853c24840c0a50c2a6df1affe029c.tar.gz
[SCSI] fix C syntax problem in scsi_lib.c
Older gcc's require variable definitions at the beginning of a block. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
-rw-r--r--drivers/scsi/scsi_lib.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index bdea26b..58da7f6 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -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);
OpenPOWER on IntegriCloud