vserver 1.9.5.x5

[linux-2.6.git] / drivers / message / fusion / mptctl.c

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index bb608fa..91153cf 100644 (file)
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -1218,7 +1218,7 @@ mptctl_getiocinfo (unsigned long arg, unsigned int data_size)
        /* Fill in the data and return the structure to the calling
         * program
         */
-       if ((int)ioc->chip_type <= (int) FC929)
+       if (ioc->bus_type == FC)
                karg->adapterType = MPT_IOCTL_INTERFACE_FC;
        else
                karg->adapterType = MPT_IOCTL_INTERFACE_SCSI;
@@ -1518,7 +1518,7 @@ mptctl_readtest (unsigned long arg)
 #ifdef MFCNT
        karg.chip_type = ioc->mfcnt;
 #else
-       karg.chip_type = ioc->chip_type;
+       karg.chip_type = ioc->pcidev->device;
 #endif
        strncpy (karg.name, ioc->name, MPT_MAX_NAME);
        karg.name[MPT_MAX_NAME-1]='\0';
@@ -2470,7 +2470,7 @@ mptctl_hp_hostinfo(unsigned long arg, unsigned int data_size)
 
        karg.base_io_addr = pci_resource_start(pdev, 0);
 
-       if ((int)ioc->chip_type <= (int) FC929)
+       if (ioc->bus_type == FC)
                karg.bus_phys_width = HP_BUS_WIDTH_UNK;
        else
                karg.bus_phys_width = HP_BUS_WIDTH_16;
@@ -2559,7 +2559,7 @@ mptctl_hp_targetinfo(unsigned long arg)
 
        /*  There is nothing to do for FCP parts.
         */
-       if ((int) ioc->chip_type <= (int) FC929)
+       if (ioc->bus_type == FC)
                return 0;
 
        if ((ioc->spi_data.sdp0length == 0) || (ioc->sh == NULL))