aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/IR/ir-lirc-codec.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/IR/ir-lirc-codec.c')
-rw-r--r--drivers/media/IR/ir-lirc-codec.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/drivers/media/IR/ir-lirc-codec.c b/drivers/media/IR/ir-lirc-codec.c
index aff31d1b13d5..178bc5baab78 100644
--- a/drivers/media/IR/ir-lirc-codec.c
+++ b/drivers/media/IR/ir-lirc-codec.c
@@ -97,8 +97,7 @@ out:
97 return ret; 97 return ret;
98} 98}
99 99
100static int ir_lirc_ioctl(struct inode *node, struct file *filep, 100static long ir_lirc_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
101 unsigned int cmd, unsigned long arg)
102{ 101{
103 struct lirc_codec *lirc; 102 struct lirc_codec *lirc;
104 struct ir_input_dev *ir_dev; 103 struct ir_input_dev *ir_dev;
@@ -154,7 +153,7 @@ static int ir_lirc_ioctl(struct inode *node, struct file *filep,
154 break; 153 break;
155 154
156 default: 155 default:
157 return lirc_dev_fop_ioctl(node, filep, cmd, arg); 156 return lirc_dev_fop_ioctl(filep, cmd, arg);
158 } 157 }
159 158
160 return ret; 159 return ret;
@@ -173,7 +172,7 @@ static void ir_lirc_close(void *data)
173static struct file_operations lirc_fops = { 172static struct file_operations lirc_fops = {
174 .owner = THIS_MODULE, 173 .owner = THIS_MODULE,
175 .write = ir_lirc_transmit_ir, 174 .write = ir_lirc_transmit_ir,
176 .ioctl = ir_lirc_ioctl, 175 .unlocked_ioctl = ir_lirc_ioctl,
177 .read = lirc_dev_fop_read, 176 .read = lirc_dev_fop_read,
178 .poll = lirc_dev_fop_poll, 177 .poll = lirc_dev_fop_poll,
179 .open = lirc_dev_fop_open, 178 .open = lirc_dev_fop_open,