From 098af593ac8a2d14495543a936c755fccac2b98b Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de>
Date: Mon, 4 Jun 2012 11:36:25 +0200
Subject: [PATCH] --- yaml --- r: 317207 b: refs/heads/master c:
 4f0a788dc892d62fabcfd61b289b6212bdedadfd h: refs/heads/master i:   317205:
 fce76f4edeb9add7821c93847fe0b51992b4bbae   317203:
 71ad49c4dc8b0350d8e5269ebaf77ccab07a064d   317199:
 980be7298aa3f2260425ec2460d4b43558b6e5f2 v: v3

---
 [refs]                                 | 2 +-
 trunk/drivers/staging/iio/dac/ad5504.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 2556f5233162..e9b9f0fdcbd6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4468cb552536731fd85f22a367602e9242a55376
+refs/heads/master: 4f0a788dc892d62fabcfd61b289b6212bdedadfd
diff --git a/trunk/drivers/staging/iio/dac/ad5504.c b/trunk/drivers/staging/iio/dac/ad5504.c
index 220150d2a165..f3d7b47cfe1d 100644
--- a/trunk/drivers/staging/iio/dac/ad5504.c
+++ b/trunk/drivers/staging/iio/dac/ad5504.c
@@ -294,7 +294,8 @@ static int __devinit ad5504_probe(struct spi_device *spi)
 	return 0;
 
 error_free_irq:
-	free_irq(spi->irq, indio_dev);
+	if (spi->irq)
+		free_irq(spi->irq, indio_dev);
 error_disable_reg:
 	if (!IS_ERR(reg))
 		regulator_disable(reg);