From 8b8efdc0a26f41e9ae24ff357b42a076955a1dcd Mon Sep 17 00:00:00 2001 From: Jarod Wilson Date: Sat, 16 Oct 2010 21:36:43 -0300 Subject: [PATCH] --- yaml --- r: 219477 b: refs/heads/master c: d889a135cb832c77b7f90a89b40090e4e9ba609b h: refs/heads/master i: 219475: ee958921096cae1ed59492a78e48ebf2e9080bec v: v3 --- [refs] | 2 +- trunk/drivers/media/IR/lirc_dev.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ebe11e46cf68..6e1f94c80ea9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 90dc4cfa2076cdc4df4c2f5dd3cadeefd9557c2c +refs/heads/master: d889a135cb832c77b7f90a89b40090e4e9ba609b diff --git a/trunk/drivers/media/IR/lirc_dev.c b/trunk/drivers/media/IR/lirc_dev.c index 19a16cef7d65..3eea3736711e 100644 --- a/trunk/drivers/media/IR/lirc_dev.c +++ b/trunk/drivers/media/IR/lirc_dev.c @@ -432,7 +432,6 @@ int lirc_dev_fop_open(struct inode *inode, struct file *file) retval = -ENODEV; goto error; } - file->private_data = ir; dev_dbg(ir->d.dev, LOGHEAD "open called\n", ir->d.name, ir->d.minor); @@ -528,7 +527,7 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg) { __u32 mode; int result = 0; - struct irctl *ir = file->private_data; + struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)]; if (!ir) { printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);