[PATCH] korina: fix probing crash

[PATCH] korina: fix probing crash

[Florian Fainelli]

From: Florian Fainelli <florian@openwrt.org>
Subject: [PATCH] korina: fix probing crash

This patch fixes the wrong retrieval of platform_data
which makes the driver crash on probe. Propagate error
if the platform_driver cannot use its data.

Signed-off-by: Florian Fainelli <florian@openwrt.org>
---
diff --git a/drivers/net/korina.c b/drivers/net/korina.c
index e185763..b2a3949 100644
--- a/drivers/net/korina.c
+++ b/drivers/net/korina.c
@@ -1078,12 +1078,18 @@ static int korina_close(struct net_device *dev)
 
 static int korina_probe(struct platform_device *pdev)
 {
-	struct korina_device *bif = platform_get_drvdata(pdev);
+	struct korina_device *bif;
 	struct korina_private *lp;
 	struct net_device *dev;
 	struct resource *r;
 	int rc;
 
+	bif = (struct korina_device *)pdev->dev.platform_data;
+	if (!bif) {
+		printk(KERN_ERR DRV_NAME ": missing platform data\n");
+		return -ENODEV;
+	}
+
 	dev = alloc_etherdev(sizeof(struct korina_private));
 	if (!dev) {
 		printk(KERN_ERR DRV_NAME ": alloc_etherdev failed\n");

Re: [PATCH] korina: fix probing crash

[David Miller]

From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 11 Jan 2009 16:54:24 +0100

> korina: fix probing crash
> 
> This patch fixes the wrong retrieval of platform_data
> which makes the driver crash on probe. Propagate error
> if the platform_driver cannot use its data.
> 
> Signed-off-by: Florian Fainelli <florian@openwrt.org>

There are several problems with this patch:

> @@ -1078,12 +1078,18 @@ static int korina_close(struct net_device *dev)
>  
>  static int korina_probe(struct platform_device *pdev)
>  {
> -	struct korina_device *bif = platform_get_drvdata(pdev);
> +	struct korina_device *bif;
>  	struct korina_private *lp;
>  	struct net_device *dev;
>  	struct resource *r;
>  	int rc;
>  
> +	bif = (struct korina_device *)pdev->dev.platform_data;

This cast is unnecessary, platform_data is "void *"

Secondly, korina_remove() also expects the korina_device pointer to be
in the platform drvdata.  It therefore has the same bug as
korina_probe() and needs to be fixed too.

But I suspect there is some other weird problem here.  If
you need to change from drvdata over to platform_data, then
this driver never could have been probed or removed properly.

This is absolutely a fundamental bug, where did it come from?

Re: [PATCH] MIPS: rb532: use driver_data instead of platform_data

[Florian Fainelli]

Le Wednesday 14 January 2009 18:41:14 Phil Sutter, vous avez écrit :
> As the korina ethernet driver uses platform_get_drvdata() to extract the
> driver specific data from the platform device, driver_data has to be
> used here.

Right, thanks for changing this.

>
> Signed-off-by: Phil Sutter <n0-1@freewrt.org>

Acked-by: Florian Fainelli <florian@openwrt.org>
-- 
Best regards, Florian Fainelli
Email : florian@openwrt.org
http://openwrt.org
-------------------------------

Re: [PATCH] korina: fix usage of driver_data

[David Miller]

From: Phil Sutter <n0-1@freewrt.org>
Date: Wed, 14 Jan 2009 18:47:21 +0100

> Using platform_set_drvdata() here makes no sense, since the driver_data
> field has already been filled with valuable data (i.e. the MAC address).
> Also having driver_data point to the net_device is rather pointless
> since struct korina_device contains an apropriate field for it.
> 
> Signed-off-by: Phil Sutter <n0-1@freewrt.org>

Applied.

[PATCH] MIPS: rb532: use driver_data instead of platform_data

[Phil Sutter]

As the korina ethernet driver uses platform_get_drvdata() to extract the
driver specific data from the platform device, driver_data has to be
used here.

Signed-off-by: Phil Sutter <n0-1@freewrt.org>
---
 arch/mips/rb532/devices.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/mips/rb532/devices.c b/arch/mips/rb532/devices.c
index 9b6b744..3c74561 100644
--- a/arch/mips/rb532/devices.c
+++ b/arch/mips/rb532/devices.c
@@ -89,7 +89,7 @@ static struct korina_device korina_dev0_data = {
 static struct platform_device korina_dev0 = {
 	.id = -1,
 	.name = "korina",
-	.dev.platform_data = &korina_dev0_data,
+	.dev.driver_data = &korina_dev0_data,
 	.resource = korina_dev0_res,
 	.num_resources = ARRAY_SIZE(korina_dev0_res),
 };
-- 
1.5.6.4

Re: [PATCH] MIPS: rb532: use driver_data instead of platform_data

[Ralf Baechle]

On Thu, Jan 15, 2009 at 03:41:44PM +0100, Phil Sutter wrote:

Applied.  Thanks,

  Ralf