Merge git://git.kernel.org/pub/scm/linux/kernel/git/bart/ide-2.6

[linux-2.6-omap-h63xx.git] / sound / oss / sb_mixer.c

diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c
index ccb21d48d42c5f4c41208e7fb767220a95d18c99..fad1a4f25ad6db0402de24f24f0c21e1be301c54 100644 (file)
--- a/sound/oss/sb_mixer.c
+++ b/sound/oss/sb_mixer.c
@@ -1,5 +1,5 @@
 /*
- * sound/sb_mixer.c
+ * sound/oss/sb_mixer.c
  *
  * The low level mixer driver for the Sound Blaster compatible cards.
  */
@@ -734,7 +734,7 @@ int sb_mixer_init(sb_devc * devc, struct module *owner)
        if (m == -1)
                return 0;
 
-       mixer_devs[m] = (struct mixer_operations *)kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
+       mixer_devs[m] = kmalloc(sizeof(struct mixer_operations), GFP_KERNEL);
        if (mixer_devs[m] == NULL)
        {
                printk(KERN_ERR "sb_mixer: Can't allocate memory\n");