From edcebac286e677c3ac5043540bc36fd7c850b9be Mon Sep 17 00:00:00 2001 From: Andrey Gusakov Date: Fri, 7 Jul 2017 20:45:01 +0300 Subject: [PATCH 051/122] MOST: core: fix memory allocation at arm64 Provide valid dev pointer to dma_alloc_coherent Signed-off-by: Andrey Gusakov --- drivers/staging/most/hdm-dim2/dim2_hdm.c | 1 + drivers/staging/most/mostcore/core.c | 2 +- drivers/staging/most/mostcore/mostcore.h | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/staging/most/hdm-dim2/dim2_hdm.c b/drivers/staging/most/hdm-dim2/dim2_hdm.c index 0e5855d..349eb66 100644 --- a/drivers/staging/most/hdm-dim2/dim2_hdm.c +++ b/drivers/staging/most/hdm-dim2/dim2_hdm.c @@ -870,6 +870,7 @@ static int dim2_probe(struct platform_device *pdev) dev->most_iface.enqueue = enqueue; dev->most_iface.poison_channel = poison_channel; dev->most_iface.request_netinfo = request_netinfo; + dev->most_iface.dev = &pdev->dev; if (np) { const char *tmp; diff --git a/drivers/staging/most/mostcore/core.c b/drivers/staging/most/mostcore/core.c index 069269d..6952ce6 100644 --- a/drivers/staging/most/mostcore/core.c +++ b/drivers/staging/most/mostcore/core.c @@ -1272,7 +1272,7 @@ static int arm_mbo_chain(struct most_c_obj *c, int dir, mbo->context = c; mbo->ifp = c->iface; mbo->hdm_channel_id = c->channel_id; - mbo->virt_address = dma_alloc_coherent(NULL, + mbo->virt_address = dma_alloc_coherent(c->iface->dev, coherent_buf_size, &mbo->bus_address, GFP_KERNEL); diff --git a/drivers/staging/most/mostcore/mostcore.h b/drivers/staging/most/mostcore/mostcore.h index 915e515..19f5d2c 100644 --- a/drivers/staging/most/mostcore/mostcore.h +++ b/drivers/staging/most/mostcore/mostcore.h @@ -252,6 +252,7 @@ struct most_interface { void (*on_netinfo)(struct most_interface *iface, unsigned char link_stat, unsigned char *mac_addr)); + struct device *dev; void *priv; }; -- 2.7.4