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

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

Merge "diag: Initialize USB memory pools even if there are no diag clients"

parents c91cc6c2 9b63cd0c

drivers/char/diag/diagchar_core.c

+8 −6
Original line number Diff line number Diff line
@@ -289,16 +289,18 @@ void diag_add_client(int i, struct file *file) 


static void diag_mempool_init(void)

{

	int i = 0;

	for (i = 0; i < POOL_TYPE_LOCAL_LAST; i++)

		diagmem_init(driver, i);

	diagmem_init(driver, POOL_TYPE_COPY);

	diagmem_init(driver, POOL_TYPE_HDLC);

	diagmem_init(driver, POOL_TYPE_USER);

	diagmem_init(driver, POOL_TYPE_DCI);

}



static void diag_mempool_exit(void)

{

	int i = 0;

	for (i = 0; i < POOL_TYPE_LOCAL_LAST; i++)

		diagmem_exit(driver, i);

	diagmem_exit(driver, POOL_TYPE_COPY);

	diagmem_exit(driver, POOL_TYPE_HDLC);

	diagmem_exit(driver, POOL_TYPE_USER);

	diagmem_exit(driver, POOL_TYPE_DCI);

}



static int diagchar_open(struct inode *inode, struct file *file)

drivers/char/diag/diagfwd.c

+3 −0
Original line number Diff line number Diff line
@@ -2279,6 +2279,9 @@ int diagfwd_init(void) 
	driver->rsp_buf_busy = 0;

	spin_lock_init(&driver->rsp_buf_busy_lock);



	diagmem_init(driver, POOL_TYPE_USB_APPS);

	diagmem_init(driver, POOL_TYPE_USB_PERIPHERALS);



	for (i = 0; i < NUM_SMD_CONTROL_CHANNELS; i++) {

		driver->separate_cmdrsp[i] = 0;

		driver->peripheral_supports_stm[i] = DISABLE_STM;