Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[mv-sheeva.git] / sound / oss / soundcard.c

diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c
index a5ab61ed0a975fff09829dfd13454b72c6839fe4..46c0d03dbecced68ca318dbbe20df52d1da4ab0b 100644 (file)
--- a/sound/oss/soundcard.c
+++ b/sound/oss/soundcard.c
@@ -249,7 +249,7 @@ static int sound_open(struct inode *inode, struct file *file)
        }
 
        mutex_unlock(&soundcard_mutex);
-       return 0;
+       return retval;
 }
 
 static int sound_release(struct inode *inode, struct file *file)