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

Commit 4e00cf9d authored by Alexandre Roux's avatar Alexandre Roux
Browse files

Merge branch '275os-r-FP4_FP3W' into 'v1-r' 

FP4: Bump to FP4.FP3W.A.128.20220516

See merge request !6
parents f6c7eb6f c0054608

drivers/mmc/core/block.c

+13 −13
Original line number Diff line number Diff line
@@ -1718,12 +1718,13 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) 
	struct mmc_card *card = mq->card;

	struct mmc_host *host = card->host;

	blk_status_t error = BLK_STS_OK;

	int retries = 0;



	do {

		u32 status;

		int err;

		int retries = 0;



		while (retries++ <= MMC_READ_SINGLE_RETRIES) {

			mmc_blk_rw_rq_prep(mqrq, card, 1, mq);



			mmc_wait_for_req(host, mrq);
@@ -1739,10 +1740,9 @@ static void mmc_blk_read_single(struct mmc_queue *mq, struct request *req) 
					goto error_exit;

			}



		if (mrq->cmd->error && retries++ < MMC_READ_SINGLE_RETRIES)

			continue;



		retries = 0;

			if (!mrq->cmd->error)

				break;

		}



		if (mrq->cmd->error ||

		    mrq->data->error ||

drivers/usb/gadget/composite.c

+3 −0
Original line number Diff line number Diff line
@@ -2062,6 +2062,9 @@ composite_setup(struct usb_gadget *gadget, const struct usb_ctrlrequest *ctrl) 
				if (w_index != 0x5 || (w_value >> 8))

					break;

				interface = w_value & 0xFF;

				if (interface >= MAX_CONFIG_INTERFACES ||

				    !os_desc_cfg->interface[interface])

					break;

				buf[6] = w_index;

				count = count_ext_prop(os_desc_cfg,

					interface);

drivers/usb/gadget/function/rndis.c

+6 −3
Original line number Diff line number Diff line
@@ -633,14 +633,17 @@ static int rndis_set_response(struct rndis_params *params, 
	rndis_set_cmplt_type *resp;

	rndis_resp_t *r;



	BufLength = le32_to_cpu(buf->InformationBufferLength);

	BufOffset = le32_to_cpu(buf->InformationBufferOffset);

	if ((BufLength > RNDIS_MAX_TOTAL_SIZE) ||

	    (BufOffset + 8 >= RNDIS_MAX_TOTAL_SIZE))

		    return -EINVAL;



	r = rndis_add_response(params, sizeof(rndis_set_cmplt_type));

	if (!r)

		return -ENOMEM;

	resp = (rndis_set_cmplt_type *)r->buf;



	BufLength = le32_to_cpu(buf->InformationBufferLength);

	BufOffset = le32_to_cpu(buf->InformationBufferOffset);



#ifdef	VERBOSE_DEBUG

	pr_debug("%s: Length: %d\n", __func__, BufLength);

	pr_debug("%s: Offset: %d\n", __func__, BufOffset);

net/packet/af_packet.c

+3 −2
Original line number Diff line number Diff line
@@ -4437,9 +4437,10 @@ static int packet_set_ring(struct sock *sk, union tpacket_req_u *req_u, 
	}



out_free_pg_vec:

	if (pg_vec) {

		bitmap_free(rx_owner_map);

	if (pg_vec)

		free_pg_vec(pg_vec, order, req->tp_block_nr);

	}

out:

	return err;

}