diff options
author | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2018-09-25 11:19:44 +0200 |
commit | fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3 (patch) | |
tree | 7d3a08a88aad2e7541231f0241d97e64df4a4208 /drivers/net/ethernet/lantiq_etop.c | |
parent | perf/x86/intel/pt: Annotate 'pt_cap_group' with __ro_after_init (diff) | |
parent | Linux 4.19-rc5 (diff) | |
download | linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.tar.xz linux-fb437bc8fe36c964d9bf2f4b568e6c77c235c5e3.zip |
Merge tag 'v4.19-rc5' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/net/ethernet/lantiq_etop.c')
-rw-r--r-- | drivers/net/ethernet/lantiq_etop.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/ethernet/lantiq_etop.c b/drivers/net/ethernet/lantiq_etop.c index 7a637b51c7d2..e08301d833e2 100644 --- a/drivers/net/ethernet/lantiq_etop.c +++ b/drivers/net/ethernet/lantiq_etop.c @@ -274,6 +274,7 @@ ltq_etop_hw_init(struct net_device *dev) struct ltq_etop_chan *ch = &priv->ch[i]; ch->idx = ch->dma.nr = i; + ch->dma.dev = &priv->pdev->dev; if (IS_TX(i)) { ltq_dma_alloc_tx(&ch->dma); |