Re: [PATCH-3.7.y-3.12.y] staging: comedi: adl_pci9111: fix incorrect irq passed to request_irq()

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On Tue, Jan 21, 2014 at 01:21:07PM +0000, Ian Abbott wrote:
> From: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> 
> commit 48108fe3daa0d142f9b97178fdb23704ea3a407b upstream
> 
> The dev->irq passed to request_irq() will always be 0 when the auto_attach
> function is called. The pcidev->irq should be used instead to get the correct
> irq number.
> 
> Signed-off-by: H Hartley Sweeten <hsweeten@xxxxxxxxxxxxxxxxxxx>
> Reviewed-by: Ian Abbott <abbotti@xxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> ---
> Applies to stable kernels 3.7.y to 3.12.y inclusive.
> Not needed for kernels prior to 3.7.y

Thank you Ian, I'm queuing it for the 3.11 kernel.

Cheers,
--
Luis

> ---
>  drivers/staging/comedi/drivers/adl_pci9111.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/staging/comedi/drivers/adl_pci9111.c b/drivers/staging/comedi/drivers/adl_pci9111.c
> index 78cea19..c9702bf 100644
> --- a/drivers/staging/comedi/drivers/adl_pci9111.c
> +++ b/drivers/staging/comedi/drivers/adl_pci9111.c
> @@ -869,7 +869,7 @@ static int pci9111_auto_attach(struct comedi_device *dev,
>  	pci9111_reset(dev);
>  
>  	if (pcidev->irq > 0) {
> -		ret = request_irq(dev->irq, pci9111_interrupt,
> +		ret = request_irq(pcidev->irq, pci9111_interrupt,
>  				  IRQF_SHARED, dev->board_name, dev);
>  		if (ret)
>  			return ret;
> -- 
> 1.8.5.3
> 
> --
> To unsubscribe from this list: send the line "unsubscribe stable" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux Kernel]     [Kernel Development Newbies]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite Hiking]     [Linux Kernel]     [Linux SCSI]