Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ccb48bb authored by akpm@osdl.org's avatar akpm@osdl.org Committed by James Bottomley
Browse files

[SCSI] fix C syntax problem in scsi_lib.c 



Older gcc's require variable definitions at the beginning of a block.

Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@SteelEye.com>
parent 84743bbc

drivers/scsi/scsi_lib.c

+3 −2
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ 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);
@@ -343,7 +344,7 @@ int scsi_execute_req(struct scsi_device *sdev, const unsigned char *cmd, 
			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);