From cf31929329a82859a4831da3620aea38544e0776 Mon Sep 17 00:00:00 2001
From: d binderman <dcb314@hotmail.com>
Date: Sun, 21 Feb 2010 10:02:59 +0000
Subject: [PATCH] --- yaml --- r: 186828 b: refs/heads/master c:
 48d07f2bf3fd6d0bbe7577f1844f7edfaf7399f6 h: refs/heads/master v: v3

---
 [refs]                                           |  2 +-
 .../staging/comedi/drivers/amplc_pci224.c        | 16 ++++------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 92e9a7cd1a4a..9a2fcea58fb3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02c7b237f6a01f580319187d4bdbf712b27a5460
+refs/heads/master: 48d07f2bf3fd6d0bbe7577f1844f7edfaf7399f6
diff --git a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
index d9836879355e..b41e5e5963aa 100644
--- a/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
+++ b/trunk/drivers/staging/comedi/drivers/amplc_pci224.c
@@ -1536,20 +1536,12 @@ static int pci224_detach(struct comedi_device *dev)
 
 		s = dev->subdevices + 0;
 		/* AO subdevice */
-		if (s->range_table_list) {
-			kfree(s->range_table_list);
-		}
+		kfree(s->range_table_list);
 	}
 	if (devpriv) {
-		if (devpriv->ao_readback) {
-			kfree(devpriv->ao_readback);
-		}
-		if (devpriv->ao_scan_vals) {
-			kfree(devpriv->ao_scan_vals);
-		}
-		if (devpriv->ao_scan_order) {
-			kfree(devpriv->ao_scan_order);
-		}
+		kfree(devpriv->ao_readback);
+		kfree(devpriv->ao_scan_vals);
+		kfree(devpriv->ao_scan_order);
 		if (devpriv->pci_dev) {
 			if (dev->iobase) {
 				comedi_pci_disable(devpriv->pci_dev);