Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...

[sfrench/cifs-2.6.git] / sound / synth / util_mem.c

diff --git a/sound/synth/util_mem.c b/sound/synth/util_mem.c
index 1d9b11f345f891525c00040202fc1adceb534b15..deabe5f899c494780eb29c188f9fe23edf8c92e8 100644 (file)
--- a/sound/synth/util_mem.c
+++ b/sound/synth/util_mem.c
@@ -19,7 +19,6 @@
  */
 
 #include <linux/mutex.h>
-#include <sound/driver.h>
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <sound/core.h>
@@ -116,7 +115,7 @@ __snd_util_memblk_new(struct snd_util_memhdr *hdr, unsigned int units,
        if (blk == NULL)
                return NULL;
 
-       if (! prev || prev == &hdr->block)
+       if (prev == &hdr->block)
                blk->offset = 0;
        else {
                struct snd_util_memblk *p = get_memblk(prev);