Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235458
b: refs/heads/master
c: 072fc8f
h: refs/heads/master
v: v3
  • Loading branch information
Bob Liu authored and Greg Kroah-Hartman committed Feb 3, 2011
1 parent c992a90 commit 05c7f07
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 8ba6ebf583f12da32036fc0f003ab4043e54692e
refs/heads/master: 072fc8f0a8df9bf36392f15b729044cb2ad27332
7 changes: 3 additions & 4 deletions trunk/drivers/base/firmware_class.c
Original file line number Diff line number Diff line change
Expand Up @@ -593,8 +593,7 @@ int
request_firmware(const struct firmware **firmware_p, const char *name,
struct device *device)
{
int uevent = 1;
return _request_firmware(firmware_p, name, device, uevent, false);
return _request_firmware(firmware_p, name, device, true, false);
}

/**
Expand All @@ -618,7 +617,7 @@ struct firmware_work {
struct device *device;
void *context;
void (*cont)(const struct firmware *fw, void *context);
int uevent;
bool uevent;
};

static int request_firmware_work_func(void *arg)
Expand Down Expand Up @@ -661,7 +660,7 @@ static int request_firmware_work_func(void *arg)
**/
int
request_firmware_nowait(
struct module *module, int uevent,
struct module *module, bool uevent,
const char *name, struct device *device, gfp_t gfp, void *context,
void (*cont)(const struct firmware *fw, void *context))
{
Expand Down
4 changes: 2 additions & 2 deletions trunk/include/linux/firmware.h
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ struct builtin_fw {
int request_firmware(const struct firmware **fw, const char *name,
struct device *device);
int request_firmware_nowait(
struct module *module, int uevent,
struct module *module, bool uevent,
const char *name, struct device *device, gfp_t gfp, void *context,
void (*cont)(const struct firmware *fw, void *context));

Expand All @@ -52,7 +52,7 @@ static inline int request_firmware(const struct firmware **fw,
return -EINVAL;
}
static inline int request_firmware_nowait(
struct module *module, int uevent,
struct module *module, bool uevent,
const char *name, struct device *device, gfp_t gfp, void *context,
void (*cont)(const struct firmware *fw, void *context))
{
Expand Down

0 comments on commit 05c7f07

Please sign in to comment.