---

yaml --- r: 317207 b: refs/heads/master c: 4f0a788 h: refs/heads/master i: 317205: fce76f4 317203: 71ad49c 317199: 980be72 v: v3
git-mirror · Jun 5, 2012 · 098af59 · 098af59
1 parent b29c8cb
commit 098af59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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);