Commit 0c83a280 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Bartosz Golaszewski

counter: 104-quad-8: Ensure number of irq matches number of base

The 104-quad-8 module calls devm_request_irq() for each device. If the
number of irq passed to the module does not match the number of base, a
default value of 0 is passed to devm_request_irq(). IRQ 0 is probably
not what the user wants, so utilize the module_isa_driver_with_irq macro
to ensure the number of irq matches the number of base.
Signed-off-by: default avatarWilliam Breathitt Gray <william.gray@linaro.org>
Acked-by: default avatarWilliam Breathitt Gray <william.gray@linaro.org>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 85ebe0af
...@@ -28,7 +28,8 @@ module_param_hw_array(base, uint, ioport, &num_quad8, 0); ...@@ -28,7 +28,8 @@ module_param_hw_array(base, uint, ioport, &num_quad8, 0);
MODULE_PARM_DESC(base, "ACCES 104-QUAD-8 base addresses"); MODULE_PARM_DESC(base, "ACCES 104-QUAD-8 base addresses");
static unsigned int irq[max_num_isa_dev(QUAD8_EXTENT)]; static unsigned int irq[max_num_isa_dev(QUAD8_EXTENT)];
module_param_hw_array(irq, uint, irq, NULL, 0); static unsigned int num_irq;
module_param_hw_array(irq, uint, irq, &num_irq, 0);
MODULE_PARM_DESC(irq, "ACCES 104-QUAD-8 interrupt line numbers"); MODULE_PARM_DESC(irq, "ACCES 104-QUAD-8 interrupt line numbers");
#define QUAD8_NUM_COUNTERS 8 #define QUAD8_NUM_COUNTERS 8
...@@ -1236,7 +1237,7 @@ static struct isa_driver quad8_driver = { ...@@ -1236,7 +1237,7 @@ static struct isa_driver quad8_driver = {
} }
}; };
module_isa_driver(quad8_driver, num_quad8); module_isa_driver_with_irq(quad8_driver, num_quad8, num_irq);
MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>"); MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");
MODULE_DESCRIPTION("ACCES 104-QUAD-8 driver"); MODULE_DESCRIPTION("ACCES 104-QUAD-8 driver");
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment