diff --git a/[refs] b/[refs]
index e2e56f142e10..de86cf9c9c4b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 81b571b77134aed29b9725f161dec6a37b48db68
+refs/heads/master: 1bf2ee4ea19d3ebeb8fe35c03dd44cb1d851e19f
diff --git a/trunk/drivers/staging/comedi/drivers/das1800.c b/trunk/drivers/staging/comedi/drivers/das1800.c
index 3c3e0455c7c4..d91c2d9d595b 100644
--- a/trunk/drivers/staging/comedi/drivers/das1800.c
+++ b/trunk/drivers/staging/comedi/drivers/das1800.c
@@ -797,10 +797,8 @@ static int das1800_detach(struct comedi_device *dev)
 			free_dma(devpriv->dma0);
 		if (devpriv->dma1)
 			free_dma(devpriv->dma1);
-		if (devpriv->ai_buf0)
-			kfree(devpriv->ai_buf0);
-		if (devpriv->ai_buf1)
-			kfree(devpriv->ai_buf1);
+		kfree(devpriv->ai_buf0);
+		kfree(devpriv->ai_buf1);
 	}
 
 	printk("comedi%d: %s: remove\n", dev->minor,