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

Commit be8526ea authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: ipa3: Fix to reset TX/RX prop with correct size"

parents 5d8aeac3 368a1104

drivers/platform/msm/ipa/ipa_clients/ipa_wdi3.c

+2 −2
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ int ipa_wdi_reg_intf(struct ipa_wdi_reg_intf_in_params *in) 
		goto fail_commit_hdr;

	}

	tx.num_props = 2;

	memset(tx_prop, 0, sizeof(*tx_prop));

	memset(tx_prop, 0, sizeof(*tx_prop) * IPA_TX_MAX_INTF_PROP);

	tx.prop = tx_prop;



	tx_prop[0].ip = IPA_IP_v4;
@@ -286,7 +286,7 @@ int ipa_wdi_reg_intf(struct ipa_wdi_reg_intf_in_params *in) 
		goto fail_commit_hdr;

	}

	rx.num_props = 2;

	memset(rx_prop, 0, sizeof(*rx_prop));

	memset(rx_prop, 0, sizeof(*rx_prop) * IPA_RX_MAX_INTF_PROP);

	rx.prop = rx_prop;

	rx_prop[0].ip = IPA_IP_v4;

	if (!ipa3_ctx->ipa_wdi3_over_gsi)

drivers/platform/msm/ipa/ipa_v3/ipa_intf.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2013-2019, The Linux Foundation. All rights reserved.

 * Copyright (c) 2013-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/fs.h>
@@ -114,6 +114,7 @@ int ipa3_register_intf_ext(const char *name, const struct ipa_tx_intf *tx, 
			kfree(intf);

			return -ENOMEM;

		}

		memcpy(intf->tx, tx->prop, len);

	}



	if (rx) {