Commit e3f89f4a authored Feb 13, 2012 by Linus Torvalds

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

parents 3b582f39 0d86f65e

kernel/params.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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

+1 −1

Original line number	Diff line number	Diff line
		@@ -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.