diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-07-05 11:54:27 +0200 |
| commit | 38f0ad7c90c2b2091e7d8689dde294fef27db68b (patch) | |
| tree | 17742c032f74a953054a99ebc04ee6cd7ead2d9d /drivers/net/macvtap.c | |
| parent | 8f0b3b7e222383a21f7d58bd97d5552b3a5dbced (diff) | |
| parent | 70a9f8797ce298544cfd07328ff59f00488bc491 (diff) | |
| download | op-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.zip op-kernel-dev-38f0ad7c90c2b2091e7d8689dde294fef27db68b.tar.gz | |
Merge tag 'asoc-v3.11-4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v3.11
A few small fixes, all driver specific. The removal of the GPIO based
pinmuxing is a bug fix, since the obsolete nodes had been removed from
the DT it stopped the driver loading.
Diffstat (limited to 'drivers/net/macvtap.c')
| -rw-r--r-- | drivers/net/macvtap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/macvtap.c b/drivers/net/macvtap.c index 59e9605..b6dd6a7 100644 --- a/drivers/net/macvtap.c +++ b/drivers/net/macvtap.c @@ -524,8 +524,10 @@ static int zerocopy_sg_from_iovec(struct sk_buff *skb, const struct iovec *from, return -EMSGSIZE; num_pages = get_user_pages_fast(base, size, 0, &page[i]); if (num_pages != size) { - for (i = 0; i < num_pages; i++) - put_page(page[i]); + int j; + + for (j = 0; j < num_pages; j++) + put_page(page[i + j]); return -EFAULT; } truesize = size * PAGE_SIZE; |
