| Message ID | 1480698974-9093-1-git-send-email-sean@mess.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Andi Shyti <andi.shyti@samsung.com> On Fri, Dec 02, 2016 at 05:16:07PM +0000, Sean Young wrote: > LIRC_SET_SEND_CARRIER ioctl should not return the carrier used, it > should return 0. > > Signed-off-by: Sean Young <sean@mess.org> > --- > 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 9bf6917..96b0ade 100644 > --- a/drivers/media/rc/mceusb.c > +++ b/drivers/media/rc/mceusb.c > @@ -890,7 +890,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) { > @@ -904,7 +904,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.9.3 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-media" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/media/rc/mceusb.c b/drivers/media/rc/mceusb.c index 9bf6917..96b0ade 100644 --- a/drivers/media/rc/mceusb.c +++ b/drivers/media/rc/mceusb.c @@ -890,7 +890,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) { @@ -904,7 +904,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; } }
LIRC_SET_SEND_CARRIER ioctl should not return the carrier used, it should return 0. Signed-off-by: Sean Young <sean@mess.org> --- drivers/media/rc/mceusb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)