diff options
| author | Timo Kokkonen <timo.t.kokkonen@iki.fi> | 2012-08-30 13:54:25 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-15 15:07:31 -0300 |
| commit | 362b29ba6eec506ff769ff465a2418b3fb74c8d6 (patch) | |
| tree | 8f5a2b87f93a6e035ea4d25219d822b21242a6c9 /drivers/media | |
| parent | 3404cb5c4dbbbac884722f418d5561d81dba969f (diff) | |
| download | linux-3.10-362b29ba6eec506ff769ff465a2418b3fb74c8d6.tar.gz linux-3.10-362b29ba6eec506ff769ff465a2418b3fb74c8d6.tar.bz2 linux-3.10-362b29ba6eec506ff769ff465a2418b3fb74c8d6.zip | |
[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: Timo Kokkonen <timo.t.kokkonen@iki.fi>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media')
| -rw-r--r-- | drivers/media/rc/Kconfig | 2 | ||||
| -rw-r--r-- | drivers/media/rc/ir-rx51.c | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/drivers/media/rc/Kconfig b/drivers/media/rc/Kconfig index a7b31b61e2f..6b0b9f0e6c6 100644 --- a/drivers/media/rc/Kconfig +++ b/drivers/media/rc/Kconfig @@ -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 diff --git a/drivers/media/rc/ir-rx51.c b/drivers/media/rc/ir-rx51.c index 9487dd33a89..546199e9ccc 100644 --- a/drivers/media/rc/ir-rx51.c +++ b/drivers/media/rc/ir-rx51.c @@ -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, |