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

Commit 416353df authored by Sreelakshmi Gownipalli's avatar Sreelakshmi Gownipalli Committed by Manoj Prabhu B
Browse files

diag: Init dci memory pools during diag bridge init 



The patch initialize the dci memory pools only during
diag bridge initialization instead of initializing
during dci ops init.

Change-Id: Ib9d2fc3dcb9bc3fca59a0e408292259b0e4a0d2c
Signed-off-by: default avatarSreelakshmi Gownipalli <sgownipa@codeaurora.org>
Signed-off-by: default avatarManoj Prabhu B <bmanoj@codeaurora.org>
parent 220df69e

drivers/char/diag/diag_dci.c

+1 −10
Original line number Diff line number Diff line
@@ -2713,7 +2713,7 @@ static void diag_dci_init_handshake_remote(void) 
	}

}



static int diag_dci_init_remote(void)

int diag_dci_init_remote(void)

{

	int i;

	struct dci_ops_tbl_t *temp = NULL;
@@ -2740,11 +2740,6 @@ static int diag_dci_init_remote(void) 


	return 0;

}

#else

static int diag_dci_init_remote(void)

{

	return 0;

}

#endif



static int diag_dci_init_ops_tbl(void)
@@ -2754,10 +2749,6 @@ static int diag_dci_init_ops_tbl(void) 
	err = diag_dci_init_local();

	if (err)

		goto err;

	err = diag_dci_init_remote();

	if (err)

		goto err;



	return 0;



err:

drivers/char/diag/diag_dci.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2012-2016, The Linux Foundation. All rights reserved.

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

 *

 * 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
@@ -323,6 +323,7 @@ unsigned char *dci_get_buffer_from_bridge(int token); 
int diag_dci_write_bridge(int token, unsigned char *buf, int len);

int diag_dci_write_done_bridge(int index, unsigned char *buf, int len);

int diag_dci_send_handshake_pkt(int index);

int diag_dci_init_remote(void);

#endif



#endif

drivers/char/diag/diagchar_core.c

+2 −0
Original line number Diff line number Diff line
@@ -970,6 +970,8 @@ static int diag_remote_init(void) 
	diagmem_setsize(POOL_TYPE_QSC_MUX, itemsize_qsc_usb,

			poolsize_qsc_usb);

	diag_md_mdm_init();

	if (diag_dci_init_remote())

		return -ENOMEM;

	driver->hdlc_encode_buf = kzalloc(DIAG_MAX_HDLC_BUF_SIZE, GFP_KERNEL);

	if (!driver->hdlc_encode_buf)

		return -ENOMEM;