diff options
Diffstat (limited to 'drivers/staging/media/lirc/lirc_serial.c')
| -rw-r--r-- | drivers/staging/media/lirc/lirc_serial.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c index bae0d467093e..181b92bfe25d 100644 --- a/drivers/staging/media/lirc/lirc_serial.c +++ b/drivers/staging/media/lirc/lirc_serial.c @@ -496,6 +496,7 @@ static long send_pulse_homebrew_softcarrier(unsigned long length) { int flag; unsigned long actual, target, d; + length <<= 8; actual = 0; target = 0; flag = 0; @@ -528,11 +529,10 @@ static long send_pulse_homebrew(unsigned long length) if (softcarrier) return send_pulse_homebrew_softcarrier(length); - else { - on(); - safe_udelay(length); - return 0; - } + + on(); + safe_udelay(length); + return 0; } static void send_space_irdeo(long length) @@ -948,7 +948,6 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) case LIRC_GET_LENGTH: return -ENOIOCTLCMD; - break; case LIRC_SET_SEND_DUTY_CYCLE: dprintk("SET_SEND_DUTY_CYCLE\n"); @@ -961,7 +960,6 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (value <= 0 || value > 100) return -EINVAL; return init_timing_params(value, freq); - break; case LIRC_SET_SEND_CARRIER: dprintk("SET_SEND_CARRIER\n"); @@ -974,7 +972,6 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) if (value > 500000 || value < 20000) return -EINVAL; return init_timing_params(duty_cycle, value); - break; default: return lirc_dev_fop_ioctl(filep, cmd, arg); |