diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2012-10-14 15:50:11 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-10-28 12:20:01 -0200 |
| commit | 895507c19f88b7bbf82f24737d86cca0398647cb (patch) | |
| tree | 544ca6fb00dceacb94cf9418eea663861cc301fc | |
| parent | 0dec86886c4836081a3327bd735cfa4745c1e048 (diff) | |
| download | linux-3.10-895507c19f88b7bbf82f24737d86cca0398647cb.tar.gz linux-3.10-895507c19f88b7bbf82f24737d86cca0398647cb.tar.bz2 linux-3.10-895507c19f88b7bbf82f24737d86cca0398647cb.zip | |
[media] staging: lirc_serial: silence GCC warning
Building lirc_serial.o triggers this GCC warning:
drivers/staging/media/lirc/lirc_serial.c: In function '__check_sense':
drivers/staging/media/lirc/lirc_serial.c:1301:1: warning: return from incompatible pointer type [enabled by default]
This can be trivially fixed by changing the 'sense' parameter from bool
to int. But, to be safe, we also need to make sure 'sense' will only be
-1, 0, or 1. There's no need to document the new values that are now
allowed for the 'sense' parameter, since they're basically useless.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Cc: Jarod Wilson <jarod@wilsonet.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
| -rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c index 97ef67036e3..08cfaf6fb39 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c @@ -1239,6 +1239,10 @@ static int __init lirc_serial_init_module(void) } } + /* make sure sense is either -1, 0, or 1 */ + if (sense != -1) + sense = !!sense; + result = lirc_serial_init(); if (result) return result; @@ -1298,7 +1302,7 @@ MODULE_PARM_DESC(irq, "Interrupt (4 or 3)"); module_param(share_irq, bool, S_IRUGO); MODULE_PARM_DESC(share_irq, "Share interrupts (0 = off, 1 = on)"); -module_param(sense, bool, S_IRUGO); +module_param(sense, int, S_IRUGO); MODULE_PARM_DESC(sense, "Override autodetection of IR receiver circuit" " (0 = active high, 1 = active low )"); |