Merge branches 'pm-sleep', 'powercap', 'pm-domains' and 'pm-cpufreq'

[karo-tx-linux.git] / block / scsi_ioctl.c

diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 5dd477bfb4bccc7d58e7a6032af7aef9c6a1c390..9b8eaeca6a794b5be8e732567aceffbe6ab6ebdb 100644 (file)
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -330,6 +330,7 @@ static int sg_io(struct request_queue *q, struct gendisk *bd_disk,
        if (blk_fill_sghdr_rq(q, rq, hdr, mode))
                goto out_free_cdb;
 
+       ret = 0;
        if (hdr->iovec_count) {
                size_t iov_data_len;
                struct iovec *iov = NULL;