* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (505 commits) [media] af9015: Fix max I2C message size when used with tda18271 [media] IR: initialize ir_raw_event in few more drivers [media] Guard a divide in v4l1 compat layer [media] imon: fix nomouse modprobe option [media] imon: remove redundant change_protocol call [media] imon: fix my egregious brown paper bag w/rdev/idev split [media] cafe_ccic: Configure ov7670 correctly [media] ov7670: allow configuration of image size, clock speed, and I/O method [media] af9015: support for DigitalNow TinyTwin v3 [1f4d:9016] [media] af9015: map DigitalNow TinyTwin v2 remote [media] DigitalNow TinyTwin remote controller [media] af9015: RC fixes and improvements videodev2.h.xml: Update to reflect the latest changes at videodev2.h [media] v4l: document new Bayer and monochrome pixel formats [media] DocBook/v4l: Add missing formats used on gspca cpia1 and sn9c2028 [media] firedtv: add parameter to fake ca_system_ids in CA_INFO [media] tm6000: fix a macro coding style issue tm6000: Remove some ugly debug code [media] Nova-S-Plus audio line input [media] [RFC,1/1] V4L2: Use new CAP bits in existing RDS capable drivers ...
Showing the changes to drivers/staging/lirc/lirc_it87.c (1 of 531 files). Show all
Unified · Split
| @@ -239,8 +239,7 @@ static ssize_t lirc_write(struct file *file, const char *buf, · 238 unmodified lines | ||
| 239 | 239 | static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) |
| 240 | 240 | { |
| 241 | 241 | int retval = 0; |
| 242 | − unsigned long value = 0; | |
| 243 | − unsigned int ivalue; | |
| 242 | + __u32 value = 0; | |
| 244 | 243 | unsigned long hw_flags; |
| 245 | 244 | |
| 246 | 245 | if (cmd == LIRC_GET_FEATURES) |
| @@ -256,24 +255,24 @@ static long lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg) · 9 unmodified lines | ||
| 256 | 255 | case LIRC_GET_FEATURES: |
| 257 | 256 | case LIRC_GET_SEND_MODE: |
| 258 | 257 | case LIRC_GET_REC_MODE: |
| 259 | − retval = put_user(value, (unsigned long *) arg); | |
| 258 | + retval = put_user(value, (__u32 *) arg); | |
| 260 | 259 | break; |
| 261 | 260 | |
| 262 | 261 | case LIRC_SET_SEND_MODE: |
| 263 | 262 | case LIRC_SET_REC_MODE: |
| 264 | − retval = get_user(value, (unsigned long *) arg); | |
| 263 | + retval = get_user(value, (__u32 *) arg); | |
| 265 | 264 | break; |
| 266 | 265 | |
| 267 | 266 | case LIRC_SET_SEND_CARRIER: |
| 268 | − retval = get_user(ivalue, (unsigned int *) arg); | |
| 267 | + retval = get_user(value, (__u32 *) arg); | |
| 269 | 268 | if (retval) |
| 270 | 269 | return retval; |
| 271 | − ivalue /= 1000; | |
| 272 | − if (ivalue > IT87_CIR_FREQ_MAX || | |
| 273 | − ivalue < IT87_CIR_FREQ_MIN) | |
| 270 | + value /= 1000; | |
| 271 | + if (value > IT87_CIR_FREQ_MAX || | |
| 272 | + value < IT87_CIR_FREQ_MIN) | |
| 274 | 273 | return -EINVAL; |
| 275 | 274 | |
| 276 | − it87_freq = ivalue; | |
| 275 | + it87_freq = value; | |
| 277 | 276 | |
| 278 | 277 | spin_lock_irqsave(&hardware_lock, hw_flags); |
| 279 | 278 | outb(((inb(io + IT87_CIR_TCR2) & IT87_CIR_TCR2_TXMPW) | |
| @@ -340,6 +339,9 @@ static const struct file_operations lirc_fops = { · 60 unmodified lines | ||
| 340 | 339 | .write = lirc_write, |
| 341 | 340 | .poll = lirc_poll, |
| 342 | 341 | .unlocked_ioctl = lirc_ioctl, |
| 342 | +#ifdef CONFIG_COMPAT | |
| 343 | + .compat_ioctl = lirc_ioctl, | |
| 344 | +#endif | |
| 343 | 345 | .open = lirc_open, |
| 344 | 346 | .release = lirc_close, |
| 345 | 347 | .llseek = noop_llseek, |
| @@ -964,10 +966,11 @@ static void __exit lirc_it87_exit(void) · 618 unmodified lines | ||
| 964 | 966 | printk(KERN_INFO LIRC_DRIVER_NAME ": Uninstalled.\n"); |
| 965 | 967 | } |
| 966 | 968 | |
| 967 | −/* SECTION: PNP for ITE8704/18 */ | |
| 969 | +/* SECTION: PNP for ITE8704/13/18 */ | |
| 968 | 970 | |
| 969 | 971 | static const struct pnp_device_id pnp_dev_table[] = { |
| 970 | 972 | {"ITE8704", 0}, |
| 973 | + {"ITE8713", 0}, | |
| 971 | 974 | {} |
| 972 | 975 | }; |
| 973 | 976 | |