diff --git a/[refs] b/[refs]
index b2198b92b1b3..7f5336d9a6b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 55e4390cb04e8b0fbae8983c3494c9e24132db1b
+refs/heads/master: 5ae8f440909dc7fddccf7f408adbacf308049691
diff --git a/trunk/drivers/staging/iio/iio_dummy_evgen.c b/trunk/drivers/staging/iio/iio_dummy_evgen.c
index da657d10471d..cdbf289bfe2d 100644
--- a/trunk/drivers/staging/iio/iio_dummy_evgen.c
+++ b/trunk/drivers/staging/iio/iio_dummy_evgen.c
@@ -102,6 +102,10 @@ static int iio_dummy_evgen_create(void)
 int iio_dummy_evgen_get_irq(void)
 {
 	int i, ret = 0;
+
+	if (iio_evgen == NULL)
+		return -ENODEV;
+
 	mutex_lock(&iio_evgen->lock);
 	for (i = 0; i < IIO_EVENTGEN_NO; i++)
 		if (iio_evgen->inuse[i] == false) {