X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=block%2Fscsi_ioctl.c;h=24f7af9d0abc226b2630f8e227ce05ffa8f1ff0e;hb=8781ba0aa9d9dd2870b75dba8d9a47e0f5a3f96a;hp=18de84c8ccd8bca5d1fafe8d0326cda0998cf87d;hpb=3995f4c5327595b51482bdac8c189736262eb6e0;p=linux-2.6-omap-h63xx.git

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 18de84c8ccd..24f7af9d0ab 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -21,6 +21,7 @@
 #include <linux/string.h>
 #include <linux/module.h>
 #include <linux/blkdev.h>
+#include <linux/capability.h>
 #include <linux/completion.h>
 #include <linux/cdrom.h>
 #include <linux/slab.h>
@@ -309,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
@@ -426,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 */