Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 362b29ba authored by Timo Kokkonen's avatar Timo Kokkonen Committed by Mauro Carvalho Chehab
Browse files

[media] ir-rx51: Trivial fixes 



-Fix typo
-Change pwm_timer_num type to match type in platform data
-Remove extra parenthesis
-Replace magic constant with proper bit defintions
-Remove duplicate exit pointer

Signed-off-by: default avatarTimo Kokkonen <timo.t.kokkonen@iki.fi>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 3404cb5c

drivers/media/rc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -296,7 +296,7 @@ config IR_RX51 
	   Say Y or M here if you want to enable support for the IR

	   transmitter diode built in the Nokia N900 (RX51) device.



	   The driver uses omap DM timers for gereating the carrier

	   The driver uses omap DM timers for generating the carrier

	   wave and pulses.



config RC_LOOPBACK

drivers/media/rc/ir-rx51.c

+6 −4
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ struct lirc_rx51 { 
	int		wbuf[WBUF_LEN];

	int		wbuf_index;

	unsigned long	device_is_open;

	unsigned int	pwm_timer_num;

	int		pwm_timer_num;

};



static void lirc_rx51_on(struct lirc_rx51 *lirc_rx51)
@@ -125,11 +125,14 @@ static irqreturn_t lirc_rx51_interrupt_handler(int irq, void *ptr) 
	if (!retval)

		return IRQ_NONE;



	if ((retval & ~OMAP_TIMER_INT_MATCH))

	if (retval & ~OMAP_TIMER_INT_MATCH)

		dev_err_ratelimited(lirc_rx51->dev,

				": Unexpected interrupt source: %x\n", retval);



	omap_dm_timer_write_status(lirc_rx51->pulse_timer, 7);

	omap_dm_timer_write_status(lirc_rx51->pulse_timer,

				OMAP_TIMER_INT_MATCH	|

				OMAP_TIMER_INT_OVERFLOW	|

				OMAP_TIMER_INT_CAPTURE);

	if (lirc_rx51->wbuf_index < 0) {

		dev_err_ratelimited(lirc_rx51->dev,

				": BUG wbuf_index has value of %i\n",
@@ -472,7 +475,6 @@ struct platform_driver lirc_rx51_platform_driver = { 
	.remove		= __exit_p(lirc_rx51_remove),

	.suspend	= lirc_rx51_suspend,

	.resume		= lirc_rx51_resume,

	.remove		= __exit_p(lirc_rx51_remove),

	.driver		= {

		.name	= DRIVER_NAME,

		.owner	= THIS_MODULE,