diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-26 12:37:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-26 12:37:52 -0400 |
| commit | cf2acfb2051fc67804162eebc5ebc8f55d3b7e2c (patch) | |
| tree | 06caac8e527f00b1a3284eb782278168f9a7cf8c /drivers/acpi/pci_root.c | |
| parent | aada1bc92797434cdf31e76fc2c6ab29307a5f48 (diff) | |
| parent | 412af97838828bc6d035a1902c8974f944663da6 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6:
ACPI: video: prevent NULL deref in acpi_get_pci_dev()
eeepc-laptop: add rfkill support for the 3G modem in Eee PC 901 Go
eeepc-laptop: get the right value for CMSG
eeepc-laptop: makes get_acpi() returns -ENODEV
eeepc-laptop: right parent device
eeepc-laptop: rfkill refactoring
eeepc-laptop.c: use pr_fmt and pr_<level>
eeepc-laptop: Register as a pci-hotplug device
Diffstat (limited to 'drivers/acpi/pci_root.c')
| -rw-r--r-- | drivers/acpi/pci_root.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c index 8a5bf3b356fa..55b5b90c2a44 100644 --- a/drivers/acpi/pci_root.c +++ b/drivers/acpi/pci_root.c | |||
| @@ -395,7 +395,7 @@ struct pci_dev *acpi_get_pci_dev(acpi_handle handle) | |||
| 395 | fn = adr & 0xffff; | 395 | fn = adr & 0xffff; |
| 396 | 396 | ||
| 397 | pdev = pci_get_slot(pbus, PCI_DEVFN(dev, fn)); | 397 | pdev = pci_get_slot(pbus, PCI_DEVFN(dev, fn)); |
| 398 | if (hnd == handle) | 398 | if (!pdev || hnd == handle) |
| 399 | break; | 399 | break; |
| 400 | 400 | ||
| 401 | pbus = pdev->subordinate; | 401 | pbus = pdev->subordinate; |