ソースを参照

gpio: mockup: parse the module params in init, not probe

If the module parameters are invalid, we should bail out from the init
function instead of detecting it during the device probe. That way we
don't even allow the user to load the module if we don't accept the
arguments.

Signed-off-by: Bartosz Golaszewski <brgl@bgdev.pl>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Bartosz Golaszewski 7 年 前
コミット
20c35ac473
1 ファイル変更3 行追加3 行削除
  1. 3 3
      drivers/gpio/gpio-mockup.c

+ 3 - 3
drivers/gpio/gpio-mockup.c

@@ -275,9 +275,6 @@ static int gpio_mockup_probe(struct platform_device *pdev)
 	struct gpio_mockup_chip *chips;
 	struct gpio_mockup_chip *chips;
 	char *chip_name;
 	char *chip_name;
 
 
-	if (gpio_mockup_params_nr < 2 || (gpio_mockup_params_nr % 2))
-		return -EINVAL;
-
 	/* Each chip is described by two values. */
 	/* Each chip is described by two values. */
 	num_chips = gpio_mockup_params_nr / 2;
 	num_chips = gpio_mockup_params_nr / 2;
 
 
@@ -333,6 +330,9 @@ static int __init gpio_mockup_init(void)
 {
 {
 	int err;
 	int err;
 
 
+	if (gpio_mockup_params_nr < 2 || (gpio_mockup_params_nr % 2))
+		return -EINVAL;
+
 	gpio_mockup_dbg_dir = debugfs_create_dir("gpio-mockup-event", NULL);
 	gpio_mockup_dbg_dir = debugfs_create_dir("gpio-mockup-event", NULL);
 	if (!gpio_mockup_dbg_dir)
 	if (!gpio_mockup_dbg_dir)
 		pr_err("%s: error creating debugfs directory\n",
 		pr_err("%s: error creating debugfs directory\n",