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

Commit ca3775d0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ADSPRPC: Use CMA for modem DSP allocations"

parents f06c05f2 8ed2ab17

drivers/char/adsprpc.c

+2 −2
Original line number Original line Diff line number Diff line 
/*

/*

 * Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

 * Copyright (c) 2012-2017, The Linux Foundation. All rights reserved.

 *

 *

 * This program is free software; you can redistribute it and/or modify

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and

 * it under the terms of the GNU General Public License version 2 and
@@ -1741,7 +1741,7 @@ static int fastrpc_session_alloc(struct fastrpc_channel_ctx *chan, int *session) 
		chan->session[0].dev = me->dev;

		chan->session[0].dev = me->dev;

		break;

		break;

	case SMD_APPS_MODEM:

	case SMD_APPS_MODEM:

		VERIFY(err, me->dev != NULL);

		VERIFY(err, me->modem_cma_dev != NULL);

		if (err)

		if (err)

			goto bail;

			goto bail;

		chan->session[0].dev = me->modem_cma_dev;

		chan->session[0].dev = me->modem_cma_dev;