1 files changed, 5 insertions, 4 deletions

diff --git a/drivers/scsi/ibmvscsi/ibmvstgt.c b/drivers/scsi/ibmvscsi/ibmvstgt.c
index bd62131b97a1..e5881e92d0fb 100644
--- a/drivers/scsi/ibmvscsi/ibmvstgt.c
+++ b/drivers/scsi/ibmvscsi/ibmvstgt.c
@@ -290,7 +290,7 @@ static int ibmvstgt_cmd_done(struct scsi_cmnd *sc,
         int err = 0;
 
         dprintk("%p %p %x %u\n", iue, target, vio_iu(iue)->srp.cmd.cdb[0],
-                cmd->usg_sg);
+                scsi_sg_count(sc));
 
         if (scsi_sg_count(sc))
                 err = srp_transfer_data(sc, &vio_iu(iue)->srp.cmd, ibmvstgt_rdma, 1, 1);
@@ -838,9 +838,6 @@ static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id)
         if (!shost)
                 goto free_vport;
         shost->transportt = ibmvstgt_transport_template;
-        err = scsi_tgt_alloc_queue(shost);
-        if (err)
-                goto put_host;
 
         target = host_to_srp_target(shost);
         target->shost = shost;
@@ -872,6 +869,10 @@ static int ibmvstgt_probe(struct vio_dev *dev, const struct vio_device_id *id)
         if (err)
                 goto destroy_queue;
 
+        err = scsi_tgt_alloc_queue(shost);
+        if (err)
+                goto destroy_queue;
+
         return 0;
 destroy_queue:
         crq_queue_destroy(target);