From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758106AbZKER4N (ORCPT ); Thu, 5 Nov 2009 12:56:13 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757500AbZKER4M (ORCPT ); Thu, 5 Nov 2009 12:56:12 -0500 Received: from eddie.linux-mips.org ([78.24.191.182]:45221 "EHLO eddie.linux-mips.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757811AbZKERzm (ORCPT ); Thu, 5 Nov 2009 12:55:42 -0500 Message-Id: <20091105152702.125802957@linux-mips.org> User-Agent: quilt/0.47-1 Date: Thu, 05 Nov 2009 16:25:58 +0100 From: Ralf Baechle To: Linus Torvalds Cc: David Daney , Greg Kroah-Hartman , devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, linux-mips@linux-mips.org, netdev@vger.kernel.org Subject: [PATCH 2/6] Staging: Octeon: Use symbolic values for irq numbers. References: <20091105152555.227009519@linux-mips.org> Content-Disposition: inline; filename=0003.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: David Daney In addition to being magic numbers, the irq number passed to free_irq is incorrect. We need to use the correct symbolic value instead. Signed-off-by: David Daney Cc: Greg Kroah-Hartman Cc: devel@driverdev.osuosl.org Cc: linux-kernel@vger.kernel.org Cc: linux-mips@linux-mips.org Cc: netdev@vger.kernel.org Signed-off-by: Ralf Baechle drivers/staging/octeon/ethernet-spi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: upstream-linus/drivers/staging/octeon/ethernet-spi.c =================================================================== --- upstream-linus.orig/drivers/staging/octeon/ethernet-spi.c +++ upstream-linus/drivers/staging/octeon/ethernet-spi.c @@ -317,6 +317,6 @@ void cvm_oct_spi_uninit(struct net_devic cvmx_write_csr(CVMX_SPXX_INT_MSK(interface), 0); cvmx_write_csr(CVMX_STXX_INT_MSK(interface), 0); } - free_irq(8 + 46, &number_spi_ports); + free_irq(OCTEON_IRQ_RML, &number_spi_ports); } }