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);