dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

firmware loader: fix build failure if FW_LOADER is m 

device_cache_fw_images need to iterate devices in system,
so this patch applies the introduced dpm_for_each_dev to
avoid link failure if CONFIG_FW_LOADER is m.

Reported-by: Fengguang Wu <fengguang.wu@intel.com>
Signed-off-by: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Ming Lei 2012-08-17 22:07:00 +08:00 committed by Greg Kroah-Hartman
parent dfe3212e01
commit ab6dd8e5ec
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/base/firmware_class.c
View File

@ -27,7 +27,6 @@
#include <linux/suspend.h>
#include "base.h"
#include "power/power.h"
MODULE_AUTHOR("Manuel Estrada Sainz");
MODULE_DESCRIPTION("Multi purpose firmware loading support");
@ -1093,7 +1092,7 @@ static int devm_name_match(struct device *dev, void *res,
return (fwn->magic == (unsigned long)match_data);
}
static void dev_cache_fw_image(struct device *dev)
static void dev_cache_fw_image(struct device *dev, void *data)
{
LIST_HEAD(todo);
struct fw_cache_entry *fce;
@ -1148,7 +1147,6 @@ static void __device_uncache_fw_images(void)
static void device_cache_fw_images(void)
{
struct firmware_cache *fwc = &fw_cache;
struct device *dev;
int old_timeout;
DEFINE_WAIT(wait);
@ -1165,10 +1163,7 @@ static void device_cache_fw_images(void)
old_timeout = loading_timeout;
loading_timeout = 10;
device_pm_lock();
list_for_each_entry(dev, &dpm_list, power.entry)
dev_cache_fw_image(dev);
device_pm_unlock();
dpm_for_each_dev(NULL, dev_cache_fw_image);
/* wait for completion of caching firmware for all devices */
spin_lock(&fwc->name_lock);