Merge tag 'for-linus' of git://github.com/rustyrussell/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 00:59:53 +0000 (16:59 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Feb 2012 00:59:53 +0000 (16:59 -0800)
* tag 'for-linus' of git://github.com/rustyrussell/linux:
  module: fix broken isapnp handling in file2alias
  module: make module param bint handle nul value

kernel/params.c
scripts/mod/file2alias.c

index 32ee04308285c051a4521a192d80dc89f34e1d59..4bc965d8a1fe8d66b66b7e7e220c08104084205a 100644 (file)
@@ -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);
index e8c9695777689eece29e90e3db66b2cc9d59c80e..d0de2a2c3a2de00cacf74ba796f5b02fa5b56a5d 100644 (file)
@@ -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.