diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-12-12 15:30:15 -0500 |
| commit | 20234989a8ae0ff418e2acdef72205fb7cb3f819 (patch) | |
| tree | 6888e6c6b8f2beef67b3f85570aebb853f8443f9 /drivers/acpi/pci_link.c | |
| parent | 92f268e034faf793f6d40de2f0fc81478a14ff39 (diff) | |
| parent | 49d7bc64283970ee83d2c954d04ba00d04e5943d (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/acpi/pci_link.c')
| -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 | ||