From 3cf8d8e4fcc4c3f9ec5fa27c179a9016530822f8 Mon Sep 17 00:00:00 2001 From: Sean Young Date: Fri, 2 Dec 2016 15:16:07 -0200 Subject: [PATCH] [media] mceusb: LIRC_SET_SEND_CARRIER returns 0 on success LIRC_SET_SEND_CARRIER ioctl should not return the carrier used, it should return 0. Signed-off-by: Sean Young Reviewed-by: Andi Shyti Signed-off-by: Mauro Carvalho Chehab --- drivers/media/rc/mceusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index d8f937c0d796..b814ead58e0e 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -886,7 +886,7 @@ static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier) cmdbuf[3] = MCE_IRDATA_TRAILER; dev_dbg(ir->dev, "disabling carrier modulation"); mce_async_out(ir, cmdbuf, sizeof(cmdbuf)); - return carrier; + return 0; } for (prescaler = 0; prescaler < 4; ++prescaler) { @@ -900,7 +900,7 @@ static int mceusb_set_tx_carrier(struct rc_dev *dev, u32 carrier) /* Transmit new carrier to mce device */ mce_async_out(ir, cmdbuf, sizeof(cmdbuf)); - return carrier; + return 0; } } -- 2.39.2