From 8edc426fee33a54fdc01728ff02f90fe78be4a07 Mon Sep 17 00:00:00 2001 From: Marc Kleine-Budde Date: Thu, 21 Oct 2010 05:07:58 +0000 Subject: [PATCH] --- yaml --- r: 218425 b: refs/heads/master c: 9a27586d3d5c3157260b055d057c6f4f6654c72c h: refs/heads/master i: 218423: 152cbba509eec1fa6de7923267d005af4b28515b v: v3 --- [refs] | 2 +- trunk/drivers/net/can/flexcan.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 582c88b225f1..f19dd470f890 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 06d6e6d2e4ef61172f342fddeea5cfa465d81578 +refs/heads/master: 9a27586d3d5c3157260b055d057c6f4f6654c72c diff --git a/trunk/drivers/net/can/flexcan.c b/trunk/drivers/net/can/flexcan.c index ef443a090ba7..d4990568baee 100644 --- a/trunk/drivers/net/can/flexcan.c +++ b/trunk/drivers/net/can/flexcan.c @@ -992,7 +992,6 @@ static int __devexit flexcan_remove(struct platform_device *pdev) unregister_flexcandev(dev); platform_set_drvdata(pdev, NULL); - free_candev(dev); iounmap(priv->base); mem = platform_get_resource(pdev, IORESOURCE_MEM, 0); @@ -1000,6 +999,8 @@ static int __devexit flexcan_remove(struct platform_device *pdev) clk_put(priv->clk); + free_candev(dev); + return 0; }