Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 3 insertions, 3 deletions

diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c
index e85789e53816..30bcfe470f83 100644
--- a/sound/oss/sequencer.c
+++ b/sound/oss/sequencer.c
@@ -241,7 +241,7 @@ int sequencer_write(int dev, struct file *file, const char __user *buf, int coun
                                 return -ENXIO;
 
                         fmt = (*(short *) &event_rec[0]) & 0xffff;
-                        err = synth_devs[dev]->load_patch(dev, fmt, buf, p + 4, c, 0);
+                        err = synth_devs[dev]->load_patch(dev, fmt, buf + p, c, 0);
                         if (err < 0)
                                 return err;
 
@@ -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");