diff options
| author | Len Brown <len.brown@intel.com> | 2006-10-14 02:28:07 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-10-14 02:28:07 -0400 |
| commit | 9aaed2b42d00d4abb2748d72d599a8033600e2bf (patch) | |
| tree | 3e887a78c239314fd29b84a4a05cc62ad770c18b /drivers/acpi/pci_link.c | |
| parent | 18d508bf5144e645443e80c606ed513f77369a50 (diff) | |
| parent | a790b323fb1b73f9388426bf3b96f153d1c90d2c (diff) | |
Pull trivial into test branch
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 7f3e7e77e794..d53bd9878ca2 100644 --- a/drivers/acpi/pci_link.c +++ b/drivers/acpi/pci_link.c | |||
| @@ -307,7 +307,7 @@ static int acpi_pci_link_set(struct acpi_pci_link *link, int irq) | |||
| 307 | if (!link || !irq) | 307 | if (!link || !irq) |
| 308 | return -EINVAL; | 308 | return -EINVAL; |
| 309 | 309 | ||
| 310 | resource = kmalloc(sizeof(*resource) + 1, GFP_ATOMIC); | 310 | resource = kmalloc(sizeof(*resource) + 1, irqs_disabled() ? GFP_ATOMIC: GFP_KERNEL); |
| 311 | if (!resource) | 311 | if (!resource) |
| 312 | return -ENOMEM; | 312 | return -ENOMEM; |
| 313 | 313 | ||