aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptspi.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/fusion/mptspi.c')
-rw-r--r--drivers/message/fusion/mptspi.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/message/fusion/mptspi.c b/drivers/message/fusion/mptspi.c
index 0e1cf5d60bd9..4248bf331e13 100644
--- a/drivers/message/fusion/mptspi.c
+++ b/drivers/message/fusion/mptspi.c
@@ -698,26 +698,26 @@ static int mptspi_slave_alloc(struct scsi_device *sdev)
698{ 698{
699 MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)sdev->host->hostdata; 699 MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *)sdev->host->hostdata;
700 VirtTarget *vtarget; 700 VirtTarget *vtarget;
701 VirtDevice *vdev; 701 VirtDevice *vdevice;
702 struct scsi_target *starget; 702 struct scsi_target *starget;
703 703
704 if (sdev->channel == 1 && 704 if (sdev->channel == 1 &&
705 mptscsih_is_phys_disk(hd->ioc, 0, sdev->id) == 0) 705 mptscsih_is_phys_disk(hd->ioc, 0, sdev->id) == 0)
706 return -ENXIO; 706 return -ENXIO;
707 707
708 vdev = kzalloc(sizeof(VirtDevice), GFP_KERNEL); 708 vdevice = kzalloc(sizeof(VirtDevice), GFP_KERNEL);
709 if (!vdev) { 709 if (!vdevice) {
710 printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n", 710 printk(MYIOC_s_ERR_FMT "slave_alloc kmalloc(%zd) FAILED!\n",
711 hd->ioc->name, sizeof(VirtDevice)); 711 hd->ioc->name, sizeof(VirtDevice));
712 return -ENOMEM; 712 return -ENOMEM;
713 } 713 }
714 714
715 vdev->lun = sdev->lun; 715 vdevice->lun = sdev->lun;
716 sdev->hostdata = vdev; 716 sdev->hostdata = vdevice;
717 717
718 starget = scsi_target(sdev); 718 starget = scsi_target(sdev);
719 vtarget = starget->hostdata; 719 vtarget = starget->hostdata;
720 vdev->vtarget = vtarget; 720 vdevice->vtarget = vtarget;
721 vtarget->num_luns++; 721 vtarget->num_luns++;
722 722
723 if (sdev->channel == 1) 723 if (sdev->channel == 1)
@@ -758,9 +758,9 @@ static int
758mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)) 758mptspi_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *))
759{ 759{
760 struct _MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata; 760 struct _MPT_SCSI_HOST *hd = (MPT_SCSI_HOST *) SCpnt->device->host->hostdata;
761 VirtDevice *vdev = SCpnt->device->hostdata; 761 VirtDevice *vdevice = SCpnt->device->hostdata;
762 762
763 if (!vdev || !vdev->vtarget) { 763 if (!vdevice || !vdevice->vtarget) {
764 SCpnt->result = DID_NO_CONNECT << 16; 764 SCpnt->result = DID_NO_CONNECT << 16;
765 done(SCpnt); 765 done(SCpnt);
766 return 0; 766 return 0;