diff options
author | Takashi Iwai <tiwai@suse.de> | 2013-11-08 10:45:38 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-11-08 10:45:38 -0500 |
commit | a6bc732b5a96b5403c2637e85c350b95ec6591f3 (patch) | |
tree | 4b1c3967cd1de42a5e36e567cbdd18e1f4e8446f /virt/kvm/kvm_main.c | |
parent | 9a22a8f558d09a83965d2bbe168294eb8ffb70e9 (diff) | |
parent | dd212bd5bb8b15889821ef79213cdb5bd47c6f85 (diff) |
Merge tag 'asoc-v3.13-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.13
Some additional fixes for v3.13, the majority of which are removals and
downgrades of BUG()s from Takashi.
Diffstat (limited to 'virt/kvm/kvm_main.c')
-rw-r--r-- | virt/kvm/kvm_main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c index a9dd682cf5e3..1cf9ccb01013 100644 --- a/virt/kvm/kvm_main.c +++ b/virt/kvm/kvm_main.c | |||
@@ -3091,7 +3091,7 @@ static const struct file_operations *stat_fops[] = { | |||
3091 | 3091 | ||
3092 | static int kvm_init_debug(void) | 3092 | static int kvm_init_debug(void) |
3093 | { | 3093 | { |
3094 | int r = -EFAULT; | 3094 | int r = -EEXIST; |
3095 | struct kvm_stats_debugfs_item *p; | 3095 | struct kvm_stats_debugfs_item *p; |
3096 | 3096 | ||
3097 | kvm_debugfs_dir = debugfs_create_dir("kvm", NULL); | 3097 | kvm_debugfs_dir = debugfs_create_dir("kvm", NULL); |