Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[pandora-kernel.git] / drivers / misc / pch_phub.c

diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c
index 5fe79df..0fd7e77 100644 (file)
--- a/drivers/misc/pch_phub.c
+++ b/drivers/misc/pch_phub.c
@@ -686,6 +686,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
        }
 
        if (id->driver_data == 1) { /* EG20T PCH */
+               const char *board_name;
+
                retval = sysfs_create_file(&pdev->dev.kobj,
                                           &dev_attr_pch_mac.attr);
                if (retval)
@@ -701,7 +703,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
                                               CLKCFG_CANCLK_MASK);
 
                /* quirk for CM-iTC board */
-               if (strstr(dmi_get_system_info(DMI_BOARD_NAME), "CM-iTC"))
+               board_name = dmi_get_system_info(DMI_BOARD_NAME);
+               if (board_name && strstr(board_name, "CM-iTC"))
                        pch_phub_read_modify_write_reg(chip,
                                                (unsigned int)CLKCFG_REG_OFFSET,
                                                CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV |
@@ -732,6 +735,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
                 * Device8(GbE)
                 */
                iowrite32(0x000a0000, chip->pch_phub_base_address + 0x14);
+               /* set the interrupt delay value */
+               iowrite32(0x25, chip->pch_phub_base_address + 0x140);
                chip->pch_opt_rom_start_address =\
                                                 PCH_PHUB_ROM_START_ADDR_ML7223;
                chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;
@@ -749,8 +754,6 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev,
                 * Device6(SATA 2):f
                 */
                iowrite32(0x0000ffa0, chip->pch_phub_base_address + 0x14);
-               /* set the interrupt delay value */
-               iowrite32(0x25, chip->pch_phub_base_address + 0x140);
                chip->pch_opt_rom_start_address =\
                                                 PCH_PHUB_ROM_START_ADDR_ML7223;
                chip->pch_mac_start_address = PCH_PHUB_MAC_START_ADDR_ML7223;