diff --git a/[refs] b/[refs]
index a9832ca51b42..b7971a65278e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4da212e2ffaa34edb887a3a86424124fe8341e34
+refs/heads/master: d07df223abb42c97dbaf2d26226c3882bcb3a3cf
diff --git a/trunk/drivers/media/rc/ir-lirc-codec.c b/trunk/drivers/media/rc/ir-lirc-codec.c
index 5faba2a2fdd3..d2fd064474aa 100644
--- a/trunk/drivers/media/rc/ir-lirc-codec.c
+++ b/trunk/drivers/media/rc/ir-lirc-codec.c
@@ -105,7 +105,7 @@ static ssize_t ir_lirc_transmit_ir(struct file *file, const char __user *buf,
 	struct lirc_codec *lirc;
 	struct rc_dev *dev;
 	unsigned int *txbuf; /* buffer with values to transmit */
-	ssize_t ret = 0;
+	ssize_t ret = -EINVAL;
 	size_t count;
 
 	lirc = lirc_get_pdata(file);