aboutsummaryrefslogtreecommitdiff
path: root/fs/proc/generic.c
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-08-30 12:35:49 +0200
committerTakashi Iwai <tiwai@suse.de>2013-08-30 12:35:49 +0200
commit3fd8a8041b3775840c8f85b6338b61beb5057160 (patch)
tree2eb4fd3eae3168ae2837c4f98188fd25f62d5939 /fs/proc/generic.c
parent1c9a341bbdc14051a4d8c74ea67269786c7d3736 (diff)
parent6d52825fd4e78b251f4844f6662a3bc4e31671c7 (diff)
Merge tag 'asoc-v3.12-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-next
ASoC: Updates for v3.12 A few more updates for v3.12, mostly small cleanups plus the addition of the DT bindings for kirkwood and the new i.MX S/PDIF driver.
Diffstat (limited to 'fs/proc/generic.c')
-rw-r--r--fs/proc/generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/proc/generic.c b/fs/proc/generic.c
index 94441a407337..737e15615b04 100644
--- a/fs/proc/generic.c
+++ b/fs/proc/generic.c
@@ -271,7 +271,7 @@ int proc_readdir_de(struct proc_dir_entry *de, struct file *file,
de = next;
} while (de);
spin_unlock(&proc_subdir_lock);
- return 0;
+ return 1;
}
int proc_readdir(struct file *file, struct dir_context *ctx)