From: Ondrej Zary <linux@rainbow-software.org>
Date: Thu, 30 Jun 2011 22:03:30 +0000 (+0200)
Subject: staging: ft1000-pcmcia: don't crash on load
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=01cafa528da6c5ffd5fe6b756ec11ec317b3f9d3;p=linux-beck.git

staging: ft1000-pcmcia: don't crash on load

Don't crash with NULL pointer dereference on load because of empty .name.

Signed-off-by: Ondrej Zary <linux@rainbow-software.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
---

diff --git a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
index 68ea035635f4..eefaa654f78e 100644
--- a/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
+++ b/drivers/staging/ft1000/ft1000-pcmcia/ft1000_cs.c
@@ -295,9 +295,7 @@ MODULE_DEVICE_TABLE(pcmcia, ft1000_ids);
 
 static struct pcmcia_driver ft1000_cs_driver = {
 	.owner = THIS_MODULE,
-	.drv = {
-		.name = "ft1000_cs",
-		},
+	.name = "ft1000_cs",
 	.probe      = ft1000_attach,
 	.remove     = ft1000_detach,
 	.id_table	= ft1000_ids,