aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi
diff options
context:
space:
mode:
authorEric Moore <eric.moore@lsi.com>2009-04-21 17:40:01 -0400
committerJames Bottomley <James.Bottomley@HansenPartnership.com>2009-04-27 11:53:58 -0400
commite5f9bb198aa47d06553b66cc5f24ded49ed0b70d (patch)
treeeb025a78c6acebf044ac144fbda27553fe27a572 /drivers/scsi
parent77bdd9ee1e1d94fa853c354dcde881ddc5d277a5 (diff)
[SCSI] mpt2sas : driver name needs to be in the MPT2IOCINFO ioctl
The driver name needs to be at the beginining of the driver_version string in MPT2IOCINFO ioctl. This is the same behaviour is there already in the mptsas driver. Signed-off-by: Eric Moore <eric.moore@lsi.com> Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Diffstat (limited to 'drivers/scsi')
-rw-r--r--drivers/scsi/mpt2sas/mpt2sas_ctl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/mpt2sas/mpt2sas_ctl.c b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
index e0eab0a9bc4c..2dc38598c207 100644
--- a/drivers/scsi/mpt2sas/mpt2sas_ctl.c
+++ b/drivers/scsi/mpt2sas/mpt2sas_ctl.c
@@ -917,9 +917,9 @@ _ctl_getiocinfo(void __user *arg)
917 karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn); 917 karg.pci_information.u.bits.function = PCI_FUNC(ioc->pdev->devfn);
918 karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus); 918 karg.pci_information.segment_id = pci_domain_nr(ioc->pdev->bus);
919 karg.firmware_version = ioc->facts.FWVersion.Word; 919 karg.firmware_version = ioc->facts.FWVersion.Word;
920 strncpy(karg.driver_version, MPT2SAS_DRIVER_VERSION, 920 strcpy(karg.driver_version, MPT2SAS_DRIVER_NAME);
921 MPT2_IOCTL_VERSION_LENGTH); 921 strcat(karg.driver_version, "-");
922 karg.driver_version[MPT2_IOCTL_VERSION_LENGTH - 1] = '\0'; 922 strcat(karg.driver_version, MPT2SAS_DRIVER_VERSION);
923 karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion); 923 karg.bios_version = le32_to_cpu(ioc->bios_pg3.BiosVersion);
924 924
925 if (copy_to_user(arg, &karg, sizeof(karg))) { 925 if (copy_to_user(arg, &karg, sizeof(karg))) {