diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-13 16:59:53 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-13 16:59:53 -0800 |
| commit | e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2 (patch) | |
| tree | d75824dea7ee72a4b384f246f84dbf9aabab8a4b | |
| parent | 3b582f393150c72b18339bc00d7ed4fb22445ed1 (diff) | |
| parent | 0d86f65ed0b727daa06d3aa176314cd175323db6 (diff) | |
| download | linux-e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2.tar.gz linux-e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2.tar.bz2 linux-e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2.zip | |
Merge tag 'for-linus' of git://github.com/rustyrussell/linux
* tag 'for-linus' of git://github.com/rustyrussell/linux:
module: fix broken isapnp handling in file2alias
module: make module param bint handle nul value
| -rw-r--r-- | kernel/params.c | 3 | ||||
| -rw-r--r-- | scripts/mod/file2alias.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/kernel/params.c b/kernel/params.c index 32ee04308285..4bc965d8a1fe 100644 --- a/kernel/params.c +++ b/kernel/params.c @@ -97,7 +97,8 @@ static int parse_one(char *param, for (i = 0; i < num_params; i++) { if (parameq(param, params[i].name)) { /* No one handled NULL, so do it here. */ - if (!val && params[i].ops->set != param_set_bool) + if (!val && params[i].ops->set != param_set_bool + && params[i].ops->set != param_set_bint) return -EINVAL; pr_debug("They are equal! Calling %p\n", params[i].ops->set); diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c index e8c969577768..d0de2a2c3a2d 100644 --- a/scripts/mod/file2alias.c +++ b/scripts/mod/file2alias.c @@ -932,7 +932,7 @@ static int do_isapnp_entry(const char *filename, (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f); return 1; } -ADD_TO_DEVTABLE("isa", struct isapnp_device_id, do_isapnp_entry); +ADD_TO_DEVTABLE("isapnp", struct isapnp_device_id, do_isapnp_entry); /* * Append a match expression for a single masked hex digit. |