projects/linux·commit e3f89f4a

Merge tag 'for-linus' of git://github.com/rustyrussell/linux

e3f89f4a · Linus Torvalds <[email protected]> · 2012-02-13 16:59:53 -08:00

* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module: fix broken isapnp handling in file2alias
  module: make module param bint handle nul value
Commit
e3f89f4ae4ea0227d49ff1cc1276ef04b2749ed2
Parents
3b582f39 · 0d86f65e

Merge commit. Changes below are compared with the first parent: 3b582f39.

Changes

2 files changed · +3 −2

FileStatusAddDelContent
kernel/params.cmodified+2−1View file
scripts/mod/file2alias.cmodified+1−1View file

kernel/params.c

View file
diff --git a/kernel/params.c b/kernel/params.c
index 32ee043..4bc965d 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);

scripts/mod/file2alias.c

View file
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index e8c9695..d0de2a2 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.