|
@@ -339,7 +339,6 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
|
|
|
struct scsi_sense_hdr sshdr;
|
|
|
u8 *cmd_buf = NULL;
|
|
|
u8 *scsi_cmd = NULL;
|
|
|
- u8 *sense_buf = NULL;
|
|
|
int rc = 0;
|
|
|
int result = 0;
|
|
|
int retry_cnt = 0;
|
|
@@ -348,8 +347,7 @@ static int read_cap16(struct scsi_device *sdev, struct llun_info *lli)
|
|
|
retry:
|
|
|
cmd_buf = kzalloc(CMD_BUFSIZE, GFP_KERNEL);
|
|
|
scsi_cmd = kzalloc(MAX_COMMAND_SIZE, GFP_KERNEL);
|
|
|
- sense_buf = kzalloc(SCSI_SENSE_BUFFERSIZE, GFP_KERNEL);
|
|
|
- if (unlikely(!cmd_buf || !scsi_cmd || !sense_buf)) {
|
|
|
+ if (unlikely(!cmd_buf || !scsi_cmd)) {
|
|
|
rc = -ENOMEM;
|
|
|
goto out;
|
|
|
}
|
|
@@ -364,7 +362,7 @@ retry:
|
|
|
/* Drop the ioctl read semahpore across lengthy call */
|
|
|
up_read(&cfg->ioctl_rwsem);
|
|
|
result = scsi_execute(sdev, scsi_cmd, DMA_FROM_DEVICE, cmd_buf,
|
|
|
- CMD_BUFSIZE, sense_buf, &sshdr, to, CMD_RETRIES,
|
|
|
+ CMD_BUFSIZE, NULL, &sshdr, to, CMD_RETRIES,
|
|
|
0, 0, NULL);
|
|
|
down_read(&cfg->ioctl_rwsem);
|
|
|
rc = check_state(cfg);
|
|
@@ -395,7 +393,6 @@ retry:
|
|
|
if (retry_cnt++ < 1) {
|
|
|
kfree(cmd_buf);
|
|
|
kfree(scsi_cmd);
|
|
|
- kfree(sense_buf);
|
|
|
goto retry;
|
|
|
}
|
|
|
}
|
|
@@ -426,7 +423,6 @@ retry:
|
|
|
out:
|
|
|
kfree(cmd_buf);
|
|
|
kfree(scsi_cmd);
|
|
|
- kfree(sense_buf);
|
|
|
|
|
|
dev_dbg(dev, "%s: maxlba=%lld blklen=%d rc=%d\n",
|
|
|
__func__, gli->max_lba, gli->blk_len, rc);
|