From fa84ec3ecf79f218da48e79d1af1f1c35bbbecda Mon Sep 17 00:00:00 2001
From: Dan Carpenter <error27@gmail.com>
Date: Sat, 22 May 2010 22:42:38 +0200
Subject: [PATCH] --- yaml --- r: 205549 b: refs/heads/master c:
 f25bd6bfdf9bccd8164c151b027f9c14ec07960b h: refs/heads/master i:   205547:
 fbd7ff6759520a2db17bb8262266d9bba4641e1f v: v3

---
 [refs]                                                 | 2 +-
 trunk/drivers/staging/comedi/drivers/cb_das16_cs.c     | 3 +--
 trunk/drivers/staging/comedi/drivers/das08_cs.c        | 3 +--
 trunk/drivers/staging/comedi/drivers/ni_daq_700.c      | 3 +--
 trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c    | 3 +--
 trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c | 3 +--
 6 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index e1ea4d869218..0dd53c74dd17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c5da20905c8ce21a73a9b443e5d7ef0dc623cff0
+refs/heads/master: f25bd6bfdf9bccd8164c151b027f9c14ec07960b
diff --git a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
index cfeb11f443e3..d8d4ed6de35c 100644
--- a/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/cb_das16_cs.c
@@ -719,8 +719,7 @@ static void das16cs_pcmcia_detach(struct pcmcia_device *link)
 	((struct local_info_t *)link->priv)->stop = 1;
 	das16cs_pcmcia_release(link);
 	/* This points to the parent struct local_info_t struct */
-	if (link->priv)
-		kfree(link->priv);
+	kfree(link->priv);
 }				/* das16cs_pcmcia_detach */
 
 
diff --git a/trunk/drivers/staging/comedi/drivers/das08_cs.c b/trunk/drivers/staging/comedi/drivers/das08_cs.c
index 8761a6d285dc..fb561ab7f07c 100644
--- a/trunk/drivers/staging/comedi/drivers/das08_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/das08_cs.c
@@ -206,8 +206,7 @@ static void das08_pcmcia_detach(struct pcmcia_device *link)
 	das08_pcmcia_release(link);
 
 	/* This points to the parent struct local_info_t struct */
-	if (link->priv)
-		kfree(link->priv);
+	kfree(link->priv);
 
 }				/* das08_pcmcia_detach */
 
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c
index 6ec77bf88c63..701abd9eabe6 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_700.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_daq_700.c
@@ -537,8 +537,7 @@ static void dio700_cs_detach(struct pcmcia_device *link)
 	dio700_release(link);
 
 	/* This points to the parent struct local_info_t struct */
-	if (link->priv)
-		kfree(link->priv);
+	kfree(link->priv);
 
 }				/* dio700_cs_detach */
 
diff --git a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
index e4865b1c2310..0b65f247d5dd 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_daq_dio24.c
@@ -289,8 +289,7 @@ static void dio24_cs_detach(struct pcmcia_device *link)
 	dio24_release(link);
 
 	/* This points to the parent local_info_t struct */
-	if (link->priv)
-		kfree(link->priv);
+	kfree(link->priv);
 
 }				/* dio24_cs_detach */
 
diff --git a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
index a91db6c42028..78eb254bd619 100644
--- a/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/quatech_daqp_cs.c
@@ -1076,8 +1076,7 @@ static void daqp_cs_detach(struct pcmcia_device *link)
 
 	/* Unlink device structure, and free it */
 	dev_table[dev->table_index] = NULL;
-	if (dev)
-		kfree(dev);
+	kfree(dev);
 
 }				/* daqp_cs_detach */