Skip to content

Commit

Permalink
Merge branch 'for-linus' of git://brick.kernel.dk/data/git/linux-2.6-…
Browse files Browse the repository at this point in the history
…block
  • Loading branch information
Linus Torvalds committed Feb 8, 2006
2 parents 328c2a8 + 01840f9 commit b7ed1de
Showing 1 changed file with 3 additions and 0 deletions.
3 changes: 3 additions & 0 deletions block/scsi_ioctl.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,8 @@ static int sg_io(struct file *file, request_queue_t *q,
if (!rq->timeout)
rq->timeout = BLK_DEFAULT_TIMEOUT;

rq->retries = 0;

start_time = jiffies;

/* ignore return value. All information is passed back to caller
Expand Down Expand Up @@ -427,6 +429,7 @@ static int sg_scsi_ioctl(struct file *file, request_queue_t *q,
rq->data = buffer;
rq->data_len = bytes;
rq->flags |= REQ_BLOCK_PC;
rq->retries = 0;

blk_execute_rq(q, bd_disk, rq, 0);
err = rq->errors & 0xff; /* only 8 bit SCSI status */
Expand Down

0 comments on commit b7ed1de

Please sign in to comment.