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

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

Merge "data-kernel : EMAC: Fixing KW errors"

parents e0b46f60 71df524a

drivers/emac-dwc-eqos/DWC_ETH_QOS_desc.c

+2 −2
Original line number Diff line number Diff line
@@ -1440,7 +1440,7 @@ static int DWC_ETH_QOS_map_page_buffs(struct DWC_ETH_QOS_prv_data *pdata, 
	DBGPR("-->DWC_ETH_QOS_map_page_buffs\n");



	if (size > DWC_ETH_QOS_MAX_DATA_PER_TX_BUF) {

		if (!prev_buffer->dma2) {

		if (prev_buffer && !prev_buffer->dma2) {

			DBGPR("prev_buffer->dma2 is empty\n");

			/* fill the first buffer pointer in pre_buffer->dma2 */

			prev_buffer->dma2 =
@@ -1505,7 +1505,7 @@ static int DWC_ETH_QOS_map_page_buffs(struct DWC_ETH_QOS_prv_data *pdata, 
			buffer->buf2_mapped_as_page = Y_TRUE;

		}

	} else {

		if (!prev_buffer->dma2) {

		if (prev_buffer && !prev_buffer->dma2) {

			DBGPR("prev_buffer->dma2 is empty\n");

			/* fill the first buffer pointer in pre_buffer->dma2 */

			prev_buffer->dma2 = dma_map_page(GET_MEM_PDEV_DEV,

drivers/emac-dwc-eqos/DWC_ETH_QOS_poll_support.c

+3 −2
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static ssize_t pps_fops_read(struct file *filp, char __user *buf, 


	unsigned int len = 0, buf_len = 5000;

	char* temp_buf;

	ssize_t ret_cnt;

	ssize_t ret_cnt = 0;

	struct pps_info *info;



	info = filp->private_data;
@@ -54,6 +54,7 @@ static ssize_t pps_fops_read(struct file *filp, char __user *buf, 


		ret_cnt = simple_read_from_buffer(buf, count, f_pos, temp_buf, len);

		kfree(temp_buf);

		if (gDWC_ETH_QOS_prv_data)

			EMACERR("poll pps2intr info=%d sent by kernel\n", gDWC_ETH_QOS_prv_data->avb_class_a_intr_cnt);

	} else if (info->channel_no == AVB_CLASS_B_CHANNEL_NUM ) {

		temp_buf = kzalloc(buf_len, GFP_KERNEL);