diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-05 11:36:15 +0300 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-05 11:36:15 +0300 |
| commit | 94558e265b9539b2ecec98d037bae51c902663c1 (patch) | |
| tree | e2782bc903759c2a8bf0af9b3a8ec090a3b1bd3e /drivers/net/ethernet/aurora/nb8800.c | |
| parent | 5ac9056753e79ac5ad1ccc3c99b311688e46e8c9 (diff) | |
| parent | 1cf915d305b6e1d57db6c35c208016f9747ba3c6 (diff) | |
| download | linux-94558e265b9539b2ecec98d037bae51c902663c1.tar.xz | |
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
Backmerge the 4.8 pull request state from Dave - conflicts were
getting out of hand, and Chris has some patches which outright don't
apply without everything merged together again.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Diffstat (limited to 'drivers/net/ethernet/aurora/nb8800.c')
| -rw-r--r-- | drivers/net/ethernet/aurora/nb8800.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/aurora/nb8800.c b/drivers/net/ethernet/aurora/nb8800.c index 08a23e6b60e9..1a3555d03a96 100644 --- a/drivers/net/ethernet/aurora/nb8800.c +++ b/drivers/net/ethernet/aurora/nb8800.c @@ -259,6 +259,7 @@ static void nb8800_receive(struct net_device *dev, unsigned int i, if (err) { netdev_err(dev, "rx buffer allocation failed\n"); dev->stats.rx_dropped++; + dev_kfree_skb(skb); return; } |