diff options
| author | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
|---|---|---|
| committer | Jody McIntyre <scjody@modernduck.com> | 2005-12-12 23:34:32 -0500 |
| commit | 525352eb6d355bef6adf597252fc6d04f2dbe66c (patch) | |
| tree | 4d2b42372ec0ac985f2775b0ea260c707e93fdd4 /drivers/acpi | |
| parent | d51e86c18a479f1dbcef3aa20e58ad04d1233016 (diff) | |
| parent | 0e670506668a43e1355b8f10c33d081a676bd521 (diff) | |
Merge with http://kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/acpi')
| -rw-r--r-- | drivers/acpi/pci_link.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/pci_link.c b/drivers/acpi/pci_link.c index 82292b77e5c6..78927c0f1551 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
| @@ -316,7 +316,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
| 316 | if (!link || !irq) | 316 | if (!link || !irq) |
| 317 | return_VALUE(-EINVAL); | 317 | return_VALUE(-EINVAL); |
| 318 | 318 | ||
| 319 | resource = kmalloc(sizeof(*resource) + 1, GFP_KERNEL); | 319 | resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); |
| 320 | if (!resource) | 320 | if (!resource) |
| 321 | return_VALUE(-ENOMEM); | 321 | return_VALUE(-ENOMEM); |
| 322 | 322 | ||