Commit 443ad0f7 authored by William Breathitt Gray's avatar William Breathitt Gray Committed by Bartosz Golaszewski
Browse files

gpio: 104-dio-48e: Ensure number of irq matches number of base 



The 104-dio-48e 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>
Signed-off-by: default avatarBartosz Golaszewski <brgl@bgdev.pl>
parent 0c83a280

drivers/gpio/gpio-104-dio-48e.c

+3 −2
Original line number Diff line number Diff line
@@ -34,7 +34,8 @@ module_param_hw_array(base, uint, ioport, &num_dio48e, 0); 
MODULE_PARM_DESC(base, "ACCES 104-DIO-48E base addresses");



static unsigned int irq[MAX_NUM_DIO48E];

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-DIO-48E interrupt line numbers");



#define DIO48E_NUM_PPI 2
@@ -358,7 +359,7 @@ static struct isa_driver dio48e_driver = { 
		.name = "104-dio-48e"

	},

};

module_isa_driver(dio48e_driver, num_dio48e);

module_isa_driver_with_irq(dio48e_driver, num_dio48e, num_irq);



MODULE_AUTHOR("William Breathitt Gray <vilhelm.gray@gmail.com>");

MODULE_DESCRIPTION("ACCES 104-DIO-48E GPIO driver");