Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 592745e2 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/of' into for-linus

parents 355cdafe 303fd71d

drivers/dma/dmaengine.c

+5 −5
Original line number Diff line number Diff line
@@ -514,16 +514,16 @@ struct dma_chan *dma_get_slave_channel(struct dma_chan *chan) 
	/* lock against __dma_request_channel */

	mutex_lock(&dma_list_mutex);



	if (chan->client_count == 0)

	if (chan->client_count == 0) {

		err = dma_chan_get(chan);

	else

		if (err)

			pr_debug("%s: failed to get %s: (%d)\n",

				__func__, dma_chan_name(chan), err);

	} else

		chan = NULL;



	mutex_unlock(&dma_list_mutex);



	if (err)

		pr_debug("%s: failed to get %s: (%d)\n",

			__func__, dma_chan_name(chan), err);



	return chan;

}

drivers/dma/of-dma.c

+2 −1
Original line number Diff line number Diff line
@@ -160,7 +160,8 @@ struct dma_chan *of_dma_request_slave_channel(struct device_node *np, 


	count = of_property_count_strings(np, "dma-names");

	if (count < 0) {

		pr_err("%s: dma-names property missing or empty\n", __func__);

		pr_err("%s: dma-names property of node '%s' missing or empty\n",

			__func__, np->full_name);

		return NULL;

	}