Merge branch 'topic/workq-update' into topic/asoc

Conflicts:
	sound/soc/codecs/wm8350.c
	sound/soc/codecs/wm8753.c
	sound/soc/sh/fsi.c
	sound/soc/soc-core.c

1 files changed, 2 insertions, 2 deletions

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index e85789e53816..5ea1098ac427 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -1646,13 +1646,13 @@ void sequencer_init(void)
 {
         if (sequencer_ok)
                 return;
-        queue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * EV_SZ);
+        queue = vmalloc(SEQ_MAX_QUEUE * EV_SZ);
         if (queue == NULL)
         {
                 printk(KERN_ERR "sequencer: Can't allocate memory for sequencer output queue\n");
                 return;
         }
-        iqueue = (unsigned char *)vmalloc(SEQ_MAX_QUEUE * IEV_SZ);
+        iqueue = vmalloc(SEQ_MAX_QUEUE * IEV_SZ);
         if (iqueue == NULL)
         {
                 printk(KERN_ERR "sequencer: Can't allocate memory for sequencer input queue\n");