diff options
author | Alexander Stein <alexander.stein@systec-electronic.com> | 2011-07-25 20:11:54 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 23:57:07 -0400 |
commit | 2b934c6236983392d01bef22e43af3051cac16f5 (patch) | |
tree | c7901f1c9392f8ebb99f0cfda871863e0c2d5500 | |
parent | 90b03f5052be92ab0ba0aa36abcf33a207706866 (diff) |
drivers/misc/pch_phub.c: don't oops if dmi_get_system_info returns NULL
If dmi_get_system_info() returns NULL, pch_phub_probe() will dereferencea
a zero pointer.
This oops was observed on an Atom based board which has no BIOS, but a
bootloder which doesn't privde DMI data.
Signed-off-by: Alexander Stein <alexander.stein@systec-electronic.com>
Cc: Tomoya MORINAGA <tomoya-linux@dsn.okisemi.com>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/misc/pch_phub.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/misc/pch_phub.c b/drivers/misc/pch_phub.c index 5fe79df44838..01eb67b4871a 100644 --- 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, | |||
686 | } | 686 | } |
687 | 687 | ||
688 | if (id->driver_data == 1) { /* EG20T PCH */ | 688 | if (id->driver_data == 1) { /* EG20T PCH */ |
689 | const char *board_name; | ||
690 | |||
689 | retval = sysfs_create_file(&pdev->dev.kobj, | 691 | retval = sysfs_create_file(&pdev->dev.kobj, |
690 | &dev_attr_pch_mac.attr); | 692 | &dev_attr_pch_mac.attr); |
691 | if (retval) | 693 | if (retval) |
@@ -701,7 +703,8 @@ static int __devinit pch_phub_probe(struct pci_dev *pdev, | |||
701 | CLKCFG_CANCLK_MASK); | 703 | CLKCFG_CANCLK_MASK); |
702 | 704 | ||
703 | /* quirk for CM-iTC board */ | 705 | /* quirk for CM-iTC board */ |
704 | if (strstr(dmi_get_system_info(DMI_BOARD_NAME), "CM-iTC")) | 706 | board_name = dmi_get_system_info(DMI_BOARD_NAME); |
707 | if (board_name && strstr(board_name, "CM-iTC")) | ||
705 | pch_phub_read_modify_write_reg(chip, | 708 | pch_phub_read_modify_write_reg(chip, |
706 | (unsigned int)CLKCFG_REG_OFFSET, | 709 | (unsigned int)CLKCFG_REG_OFFSET, |
707 | CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV | | 710 | CLKCFG_UART_48MHZ | CLKCFG_BAUDDIV | |