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

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

Merge "usb: gadget: composite: fix dereference after null check coverify warning"

parents baa3d606 19e19a17

drivers/usb/gadget/composite.c

+2 −0
Original line number Diff line number Diff line
@@ -1963,6 +1963,8 @@ unknown: 
			break;



		case USB_RECIP_ENDPOINT:

			if (!cdev->config)

				break;

			endp = ((w_index & 0x80) >> 3) | (w_index & 0x0f);

			list_for_each_entry(f, &cdev->config->functions, list) {

				if (test_bit(endp, f->endpoints))

drivers/usb/pd/policy_engine.c

+2 −1
Original line number Diff line number Diff line
@@ -925,6 +925,7 @@ int usbpd_send_vdm(struct usbpd *pd, u32 vdm_hdr, const u32 *vdos, int num_vdos) 
		return -ENOMEM;



	vdm_tx->data[0] = vdm_hdr;

	if (vdos && num_vdos)

		memcpy(&vdm_tx->data[1], vdos, num_vdos * sizeof(u32));

	vdm_tx->size = num_vdos + 1; /* include the header */

drivers/usb/pd/qpnp-pdphy.c

+5 −3
Original line number Diff line number Diff line
@@ -445,6 +445,8 @@ int pd_phy_write(u16 hdr, const u8 *data, size_t data_len, 


	dev_dbg(pdphy->dev, "%s: hdr %x frame type %d timeout %u\n",

			__func__, hdr, type, timeout_ms);



	if (data && data_len)

		print_hex_dump_debug("tx data obj:", DUMP_PREFIX_NONE, 32, 4,

				data, data_len, false);
@@ -472,7 +474,7 @@ int pd_phy_write(u16 hdr, const u8 *data, size_t data_len, 
	if (ret)

		return ret;



	if (data_len) {

	if (data && data_len) {

		/* write data objects of SOP message */

		ret = pdphy_bulk_reg_write(pdphy, USB_PDPHY_TX_BUFFER_DATA,

				data, data_len);