| commit | 596a1b746c56f974240c8df6d8e3a026c54266ff | [log] [tgz] |
|---|---|---|
| author | David S. Miller <davem@davemloft.net> | Thu Nov 17 17:31:49 2011 -0500 |
| committer | David S. Miller <davem@davemloft.net> | Thu Nov 17 17:31:49 2011 -0500 |
| tree | a6c50df4b1fcf8c8c912ba64e0d359f672e8d0fe | |
| parent | 38ff1edb52f737d490126728e3d5ba2b8d2f3ba0 [diff] | |
| parent | c4be3c2da1ab4344d3d5f63d6ec1952a3c6e635c [diff] |
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
diff --git a/drivers/usb/gadget/f_phonet.c b/drivers/usb/gadget/f_phonet.c index 3490770..16a509a 100644 --- a/drivers/usb/gadget/f_phonet.c +++ b/drivers/usb/gadget/f_phonet.c
@@ -346,7 +346,7 @@ } skb_add_rx_frag(skb, skb_shinfo(skb)->nr_frags, page, - skb->len == 0, req->actual); + skb->len <= 1, req->actual); page = NULL; if (req->actual < req->length) { /* Last fragment */