diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-16 18:33:49 +0100 |
| commit | ee1156c11a1121e118b0a7f2dec240f0d421b1fd (patch) | |
| tree | b8771cc5a9758af9d7410fc519227c036c222130 /sound/isa/gus/gus_mem.c | |
| parent | b9f8fcd55bbdb037e5332dbdb7b494f0b70861ac (diff) | |
| parent | 8bea8672edfca7ec5f661cafb218f1205863b343 (diff) | |
Merge branch 'linus' into sched/urgent
Conflicts:
kernel/sched_idletask.c
Merge reason: resolve the conflicts, pick up latest changes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'sound/isa/gus/gus_mem.c')
| -rw-r--r-- | sound/isa/gus/gus_mem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sound/isa/gus/gus_mem.c b/sound/isa/gus/gus_mem.c index 661205c4dce..af888a022fc 100644 --- a/sound/isa/gus/gus_mem.c +++ b/sound/isa/gus/gus_mem.c @@ -127,7 +127,8 @@ static struct snd_gf1_mem_block *snd_gf1_mem_share(struct snd_gf1_mem * alloc, !share_id[2] && !share_id[3]) return NULL; for (block = alloc->first; block; block = block->next) - if (!memcmp(share_id, block->share_id, sizeof(share_id))) + if (!memcmp(share_id, block->share_id, + sizeof(block->share_id))) return block; return NULL; } |