diff --git a/[refs] b/[refs]
index e832910412ed..11346849ff4f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0df4d6e5bd008a94f1527aa751bbcf7160257c1d
+refs/heads/master: 0990a97a1fc649bf9a7e6057c326a835d1520847
diff --git a/trunk/drivers/media/rc/lirc_dev.c b/trunk/drivers/media/rc/lirc_dev.c
index 35002367485c..5247d94fea29 100644
--- a/trunk/drivers/media/rc/lirc_dev.c
+++ b/trunk/drivers/media/rc/lirc_dev.c
@@ -752,16 +752,7 @@ EXPORT_SYMBOL(lirc_dev_fop_read);
 
 void *lirc_get_pdata(struct file *file)
 {
-	void *data = NULL;
-
-	if (file && file->f_dentry && file_inode(file) &&
-	    file_inode(file)->i_rdev) {
-		struct irctl *ir;
-		ir = irctls[iminor(file_inode(file))];
-		data = ir->d.data;
-	}
-
-	return data;
+	return irctls[iminor(file_inode(file))]->d.data;
 }
 EXPORT_SYMBOL(lirc_get_pdata);