[patch] Patch for lirc-0.9.0-r5 for kernel 4.0.5 for lirc_dev.c

0001-fix-file-dentry.patch (text/plain), 2.27 KB, created by Tom Dexter on 2015-12-13 17:00:12 UTC

From 9dafd2848fac6994d4ced190bd9e67f5b94d6695 Mon Sep 17 00:00:00 2001
From: Georg Gast <[e-mail]>
Date: Sun, 3 May 2015 10:57:40 +0200
Subject: [PATCH] fix file dentry

---
 drivers/lirc_dev/lirc_dev.c | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/lirc_dev/lirc_dev.c b/drivers/lirc_dev/lirc_dev.c
index 117ed8d..fed349f 100644
--- a/drivers/lirc_dev/lirc_dev.c
+++ b/drivers/lirc_dev/lirc_dev.c
@@ -620,7 +620,7 @@ EXPORT_SYMBOL(lirc_dev_fop_close);
 
 unsigned int lirc_dev_fop_poll(struct file *file, poll_table *wait)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 	unsigned int ret;
 
 	if (!ir) {
@@ -666,7 +666,7 @@ long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 35)
 	struct irctl *ir = irctls[iminor(inode)];
 #else
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 #endif
 	if (!ir) {
 		printk(KERN_ERR "lirc_dev: %s: no irctl found!\n", __func__);
@@ -751,7 +751,7 @@ ssize_t lirc_dev_fop_read(struct file *file,
 			  size_t length,
 			  loff_t *ppos)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 	unsigned char *buf;
 	int ret = 0, written = 0;
 	DECLARE_WAITQUEUE(wait, current);
@@ -852,10 +852,10 @@ void *lirc_get_pdata(struct file *file)
 {
 	void *data = NULL;
 
-	if (file && file->f_dentry && file->f_dentry->d_inode &&
-	    file->f_dentry->d_inode->i_rdev) {
+	if (file && file->f_path.dentry && file->f_path.dentry->d_inode &&
+	    file->f_path.dentry->d_inode->i_rdev) {
 		struct irctl *ir;
-		ir = irctls[iminor(file->f_dentry->d_inode)];
+		ir = irctls[iminor(file->f_path.dentry->d_inode)];
 		data = ir->d.data;
 	}
 
@@ -867,7 +867,7 @@ EXPORT_SYMBOL(lirc_get_pdata);
 ssize_t lirc_dev_fop_write(struct file *file, const char *buffer,
 			   size_t length, loff_t *ppos)
 {
-	struct irctl *ir = irctls[iminor(file->f_dentry->d_inode)];
+	struct irctl *ir = irctls[iminor(file->f_path.dentry->d_inode)];
 
 	if (!ir) {
 		printk(KERN_ERR "%s: called with invalid irctl\n", __func__);
-- 
2.0.5