From 3c8793c6c9bd490f032d501b0eff8a7d6b5316a3 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Sat, 21 Jan 2012 02:08:18 -0800 Subject: [PATCH] --- yaml --- r: 294695 b: refs/heads/master c: ef62dfefa93bc90f1cb0f4a55c2d86b3269b3f92 h: refs/heads/master i: 294693: f8a9cd044bc51e90b358a70d43f157f2f7da0792 294691: d60dd1c84e3c0c707d3f312beae06b3da1a0ff5c 294687: ba17b23bb7c63283acb7cc70dacbf62e1ac7a635 v: v3 --- [refs] | 2 +- trunk/drivers/pci/setup-bus.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 75b92d295d47..de1cca2091fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a4ac9fea016fc5c09227eb479bd35e34978323a4 +refs/heads/master: ef62dfefa93bc90f1cb0f4a55c2d86b3269b3f92 diff --git a/trunk/drivers/pci/setup-bus.c b/trunk/drivers/pci/setup-bus.c index 9d932f4e4f98..0282fde43951 100644 --- a/trunk/drivers/pci/setup-bus.c +++ b/trunk/drivers/pci/setup-bus.c @@ -64,7 +64,7 @@ void pci_realloc(void) * @add_size: additional size to be optionally added * to the resource */ -static void add_to_list(struct resource_list_x *head, +static int add_to_list(struct resource_list_x *head, struct pci_dev *dev, struct resource *res, resource_size_t add_size, resource_size_t min_align) { @@ -75,7 +75,7 @@ static void add_to_list(struct resource_list_x *head, tmp = kmalloc(sizeof(*tmp), GFP_KERNEL); if (!tmp) { pr_warning("add_to_list: kmalloc() failed!\n"); - return; + return -ENOMEM; } tmp->next = ln; @@ -87,6 +87,8 @@ static void add_to_list(struct resource_list_x *head, tmp->add_size = add_size; tmp->min_align = min_align; list->next = tmp; + + return 0; } static void add_to_failed_list(struct resource_list_x *head,