From: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat, 30 Mar 2013 00:45:38 +0000 (-0400)
Subject: dgrp procfs fixes, part 2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=878c68c6c2a28e3c3a62f723e0eaa2fd02297594;p=linux-beck.git

dgrp procfs fixes, part 2

All table entries either have non-NULL ->proc_file_fops or
non-NULL child.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
---

diff --git a/drivers/staging/dgrp/dgrp_specproc.c b/drivers/staging/dgrp/dgrp_specproc.c
index 556cb3124da6..23b10f365bc3 100644
--- a/drivers/staging/dgrp/dgrp_specproc.c
+++ b/drivers/staging/dgrp/dgrp_specproc.c
@@ -269,10 +269,7 @@ static void register_proc_table(struct dgrp_proc_entry *table,
 			de->data = (void *) table;
 			if (!table->child) {
 				de->proc_iops = &proc_inode_ops;
-				if (table->proc_file_ops)
-					de->proc_fops = table->proc_file_ops;
-				else
-					de->proc_fops = &dgrp_proc_file_ops;
+				de->proc_fops = table->proc_file_ops;
 			}
 		}
 		table->de = de;