diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-08-04 11:11:22 +0200 |
| commit | 2e65b8916cce4436df29812610d2c2fecdb42b5a (patch) | |
| tree | fdcae670bd651c8e772eb7cd60420eba5d26a0db /sound/pci/trident/trident_memory.c | |
| parent | 7440850c20b69658f322119d20a94dc914127cc7 (diff) | |
| parent | 00ef99408b6cc8d86ca614ada8025aa3606860db (diff) | |
| download | linux-2e65b8916cce4436df29812610d2c2fecdb42b5a.tar.bz2 | |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'sound/pci/trident/trident_memory.c')
| -rw-r--r-- | sound/pci/trident/trident_memory.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sound/pci/trident/trident_memory.c b/sound/pci/trident/trident_memory.c index 3102a579660b..04c474658e3c 100644 --- a/sound/pci/trident/trident_memory.c +++ b/sound/pci/trident/trident_memory.c @@ -139,12 +139,11 @@ static inline void *offset_ptr(struct snd_trident *trident, int offset) static struct snd_util_memblk * search_empty(struct snd_util_memhdr *hdr, int size) { - struct snd_util_memblk *blk, *prev; + struct snd_util_memblk *blk; int page, psize; struct list_head *p; psize = get_aligned_page(size + ALIGN_PAGE_SIZE -1); - prev = NULL; page = 0; list_for_each(p, &hdr->block) { blk = list_entry(p, struct snd_util_memblk, list); |