From 894f3033f1ea96e6ae6d77b580962e8b02651343 Mon Sep 17 00:00:00 2001 From: Alexander Stein Date: Mon, 25 Jul 2011 17:11:54 -0700 Subject: [PATCH] --- yaml --- r: 258925 b: refs/heads/master c: 2b934c6236983392d01bef22e43af3051cac16f5 h: refs/heads/master i: 258923: 176c359b0b18b106c17b6d1da7e3e6a731e203af v: v3 --- [refs] | 2 +- trunk/drivers/misc/pch_phub.c | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fd6985cd4029..56dcf0280f9b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90b03f5052be92ab0ba0aa36abcf33a207706866 +refs/heads/master: 2b934c6236983392d01bef22e43af3051cac16f5 diff --git a/trunk/drivers/misc/pch_phub.c b/trunk/drivers/misc/pch_phub.c index 5fe79df44838..01eb67b4871a 100644 --- a/trunk/drivers/misc/pch_phub.c +++ b/trunk/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 |