aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/message/fusion/mptctl.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/message/fusion/mptctl.c')
-rw-r--r--drivers/message/fusion/mptctl.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 70a812a2514d..1a1bc66c8e9c 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1145,7 +1145,9 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
1145 /* Fill in the data and return the structure to the calling 1145 /* Fill in the data and return the structure to the calling
1146 * program 1146 * program
1147 */ 1147 */
1148 if (ioc->bus_type == FC) 1148 if (ioc->bus_type == SAS)
1149 karg->adapterType = MPT_IOCTL_INTERFACE_SAS;
1150 else if (ioc->bus_type == FC)
1149 karg->adapterType = MPT_IOCTL_INTERFACE_FC; 1151 karg->adapterType = MPT_IOCTL_INTERFACE_FC;
1150 else 1152 else
1151 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI; 1153 karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
@@ -2391,7 +2393,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
2391 2393
2392 karg.base_io_addr = pci_resource_start(pdev, 0); 2394 karg.base_io_addr = pci_resource_start(pdev, 0);
2393 2395
2394 if (ioc->bus_type == FC) 2396 if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
2395 karg.bus_phys_width = HP_BUS_WIDTH_UNK; 2397 karg.bus_phys_width = HP_BUS_WIDTH_UNK;
2396 else 2398 else
2397 karg.bus_phys_width = HP_BUS_WIDTH_16; 2399 karg.bus_phys_width = HP_BUS_WIDTH_16;
@@ -2480,7 +2482,7 @@ mptctl_hp_targetinfo(unsigned long arg)
2480 2482
2481 /* There is nothing to do for FCP parts. 2483 /* There is nothing to do for FCP parts.
2482 */ 2484 */
2483 if (ioc->bus_type == FC) 2485 if ((ioc->bus_type == SAS) || (ioc->bus_type == FC))
2484 return 0; 2486 return 0;
2485 2487
2486 if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL)) 2488 if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL))