diff --git a/[refs] b/[refs]
index c460a2a844e5..12b3e102c046 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f4a6adf1e54324756917459c52ec7bfdc28d6e7f
+refs/heads/master: d888ea03a0a8798e5a7632d0808cd69f577b75c5
diff --git a/trunk/drivers/media/video/saa7164/saa7164-core.c b/trunk/drivers/media/video/saa7164/saa7164-core.c
index 968ecd4ad495..15ea90731ba7 100644
--- a/trunk/drivers/media/video/saa7164/saa7164-core.c
+++ b/trunk/drivers/media/video/saa7164/saa7164-core.c
@@ -123,6 +123,12 @@ static irqreturn_t saa7164_irq(int irq, void *dev_id)
 	u32 intstat[INT_SIZE/4];
 	int i, handled = 0, bit;
 
+	if (dev == 0) {
+		printk(KERN_ERR "%s() No device specified\n", __func__);
+		handled = 0;
+		goto out;
+	}
+
 	/* Check that the hardware is accessable. If the status bytes are
 	 * 0xFF then the device is not accessable, the the IRQ belongs
 	 * to another driver.