lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module: fix broken isapnp handling in file2alias
  module: make module param bint handle nul value
This commit is contained in:
Linus Torvalds
2012-02-13 16:59:53 -08:00
parent 3b582f3931 0d86f65ed0
commit e3f89f4ae4
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kernel/params.c
View File

@@ -97,7 +97,8 @@ static int parse_one(char *param,
for (i = 0; i < num_params; i++) { for (i = 0; i < num_params; i++) {
if (parameq(param, params[i].name)) { if (parameq(param, params[i].name)) {
/* No one handled NULL, so do it here. */ /* 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; return -EINVAL;
pr_debug("They are equal! Calling %p\n", pr_debug("They are equal! Calling %p\n",
params[i].ops->set); params[i].ops->set);

2
scripts/mod/file2alias.c
View File

@@ -932,7 +932,7 @@ static int do_isapnp_entry(const char *filename,
(id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f); (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
return 1; 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. * Append a match expression for a single masked hex digit.