Pull osi into release branch

[sfrench/cifs-2.6.git] / sound / core / sound.c

diff --git a/sound/core/sound.c b/sound/core/sound.c
index 4084de06412707e28011788d56c02aa60514fe10..8dc7a3b32b98482bc12f1b60aa6cb25352d41bf3 100644 (file)
--- a/sound/core/sound.c
+++ b/sound/core/sound.c
@@ -168,7 +168,7 @@ static int snd_open(struct inode *inode, struct file *file)
        return err;
 }
 
-static struct file_operations snd_fops =
+static const struct file_operations snd_fops =
 {
        .owner =        THIS_MODULE,
        .open =         snd_open
@@ -446,8 +446,7 @@ static void __exit alsa_sound_exit(void)
 {
        snd_info_minor_unregister();
        snd_info_done();
-       if (unregister_chrdev(major, "alsa") != 0)
-               snd_printk(KERN_ERR "unable to unregister major device number %d\n", major);
+       unregister_chrdev(major, "alsa");
 }
 
 module_init(alsa_sound_init)