diff options
Diffstat (limited to 'drivers/scsi/st.c')
-rw-r--r-- | drivers/scsi/st.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c index 1272dd249af..7f669b60067 100644 --- a/drivers/scsi/st.c +++ b/drivers/scsi/st.c | |||
@@ -368,7 +368,7 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt) | |||
368 | SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2], | 368 | SRpnt->cmd[0], SRpnt->cmd[1], SRpnt->cmd[2], |
369 | SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]); | 369 | SRpnt->cmd[3], SRpnt->cmd[4], SRpnt->cmd[5]); |
370 | if (cmdstatp->have_sense) | 370 | if (cmdstatp->have_sense) |
371 | __scsi_print_sense("st", SRpnt->sense, SCSI_SENSE_BUFFERSIZE); | 371 | __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE); |
372 | } ) /* end DEB */ | 372 | } ) /* end DEB */ |
373 | if (!debugging) { /* Abnormal conditions for tape */ | 373 | if (!debugging) { /* Abnormal conditions for tape */ |
374 | if (!cmdstatp->have_sense) | 374 | if (!cmdstatp->have_sense) |
@@ -384,9 +384,8 @@ static int st_chk_result(struct scsi_tape *STp, struct st_request * SRpnt) | |||
384 | scode != VOLUME_OVERFLOW && | 384 | scode != VOLUME_OVERFLOW && |
385 | SRpnt->cmd[0] != MODE_SENSE && | 385 | SRpnt->cmd[0] != MODE_SENSE && |
386 | SRpnt->cmd[0] != TEST_UNIT_READY) { | 386 | SRpnt->cmd[0] != TEST_UNIT_READY) { |
387 | printk(KERN_WARNING "%s: Error with sense data: ", name); | 387 | |
388 | __scsi_print_sense("st", SRpnt->sense, | 388 | __scsi_print_sense(name, SRpnt->sense, SCSI_SENSE_BUFFERSIZE); |
389 | SCSI_SENSE_BUFFERSIZE); | ||
390 | } | 389 | } |
391 | } | 390 | } |
392 | 391 | ||
@@ -2818,7 +2817,7 @@ static int st_int_ioctl(struct scsi_tape *STp, unsigned int cmd_in, unsigned lon | |||
2818 | (cmdstatp->sense_hdr.sense_key == NO_SENSE || | 2817 | (cmdstatp->sense_hdr.sense_key == NO_SENSE || |
2819 | cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) && | 2818 | cmdstatp->sense_hdr.sense_key == RECOVERED_ERROR) && |
2820 | undone == 0) { | 2819 | undone == 0) { |
2821 | ioctl_result = 0; /* EOF written succesfully at EOM */ | 2820 | ioctl_result = 0; /* EOF written successfully at EOM */ |
2822 | if (fileno >= 0) | 2821 | if (fileno >= 0) |
2823 | fileno++; | 2822 | fileno++; |
2824 | STps->drv_file = fileno; | 2823 | STps->drv_file = fileno; |
@@ -3599,7 +3598,6 @@ static struct st_buffer * | |||
3599 | tb->use_sg = max_sg; | 3598 | tb->use_sg = max_sg; |
3600 | tb->frp = (struct st_buf_fragment *)(&(tb->sg[0]) + max_sg); | 3599 | tb->frp = (struct st_buf_fragment *)(&(tb->sg[0]) + max_sg); |
3601 | 3600 | ||
3602 | tb->in_use = 1; | ||
3603 | tb->dma = need_dma; | 3601 | tb->dma = need_dma; |
3604 | tb->buffer_size = got; | 3602 | tb->buffer_size = got; |
3605 | 3603 | ||