Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b0052b08 authored by Marc Kleine-Budde's avatar Marc Kleine-Budde Committed by David S. Miller
Browse files

can: c_can_platform: fix irq check in probe 



This patch fixes the check in the probe function whether a IRQ was supplied
to the driver. The original driver check the irq "struct resource *" against
<= 0. Use "platform_get_irq" instead.

Signed-off-by: default avatarMarc Kleine-Budde <mkl@pengutronix.de>
Cc: Bhupesh Sharma <bhupesh.sharma@st.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee6f0988

drivers/net/can/c_can/c_can_platform.c

+5 −4
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 
	void __iomem *addr;

	struct net_device *dev;

	struct c_can_priv *priv;

	struct resource *mem, *irq;

	struct resource *mem;

	int irq;

#ifdef CONFIG_HAVE_CLK

	struct clk *clk;
@@ -88,8 +89,8 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 


	/* get the platform data */

	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);

	irq = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	if (!mem || (irq <= 0)) {

	irq = platform_get_irq(pdev, 0);

	if (!mem || irq <= 0) {

		ret = -ENODEV;

		goto exit_free_clk;

	}
@@ -117,7 +118,7 @@ static int __devinit c_can_plat_probe(struct platform_device *pdev) 


	priv = netdev_priv(dev);



	dev->irq = irq->start;

	dev->irq = irq;

	priv->regs = addr;

#ifdef CONFIG_HAVE_CLK

	priv->can.clock.freq = clk_get_rate(clk);