projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'opw-next' into staging-next
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
media
/
lirc
/
lirc_serial.c
diff --git
a/drivers/staging/media/lirc/lirc_serial.c
b/drivers/staging/media/lirc/lirc_serial.c
index
2e3a985
..
abe0d5c
100644
(file)
--- a/
drivers/staging/media/lirc/lirc_serial.c
+++ b/
drivers/staging/media/lirc/lirc_serial.c
@@
-428,8
+428,8
@@
static int init_timing_params(unsigned int new_duty_cycle,
period = 256 * 1000000L / freq;
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
period = 256 * 1000000L / freq;
pulse_width = period * duty_cycle / 100;
space_width = period - pulse_width;
- dprintk("in init_timing_params, freq=%d pulse=%ld,
"
-
"space=%ld\n",
freq, pulse_width, space_width);
+ dprintk("in init_timing_params, freq=%d pulse=%ld,
space=%ld\n",
+ freq, pulse_width, space_width);
return 0;
}
#endif /* USE_RDTSC */
return 0;
}
#endif /* USE_RDTSC */
@@
-974,7
+974,7
@@
static void set_use_dec(void *data)
spin_unlock_irqrestore(&hardware[type].lock, flags);
}
spin_unlock_irqrestore(&hardware[type].lock, flags);
}
-static ssize_t lirc_write(struct file *file, const char *buf,
+static ssize_t lirc_write(struct file *file, const char
__user
*buf,
size_t n, loff_t *ppos)
{
int i, count;
size_t n, loff_t *ppos)
{
int i, count;