Merge "usb: dwc3-msm: Fix NULL pointer dereference in gsi_ring_db" (b6be3e09) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/usb/dwc3/dwc3-msm.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -948,13 +948,17 @@ static void gsi_ring_db(struct usb_ep ep, struct usb_gsi_request request)

	gsi_dbl_address_lsb = devm_ioremap_nocache(mdwc->dev,		gsi_dbl_address_lsb = devm_ioremap_nocache(mdwc->dev,
	dbl_lo_addr, sizeof(u32));		dbl_lo_addr, sizeof(u32));
	if (!gsi_dbl_address_lsb)		if (!gsi_dbl_address_lsb) {
	dev_dbg(mdwc->dev, "Failed to get GSI DBL address LSB\n");		dev_err(mdwc->dev, "Failed to get GSI DBL address LSB\n");
			return;
			}

	gsi_dbl_address_msb = devm_ioremap_nocache(mdwc->dev,		gsi_dbl_address_msb = devm_ioremap_nocache(mdwc->dev,
	dbl_hi_addr, sizeof(u32));		dbl_hi_addr, sizeof(u32));
	if (!gsi_dbl_address_msb)		if (!gsi_dbl_address_msb) {
	dev_dbg(mdwc->dev, "Failed to get GSI DBL address MSB\n");		dev_err(mdwc->dev, "Failed to get GSI DBL address MSB\n");
			return;
			}

	offset = dwc3_trb_dma_offset(dep, &dep->trb_pool[num_trbs-1]);		offset = dwc3_trb_dma_offset(dep, &dep->trb_pool[num_trbs-1]);
	dev_dbg(mdwc->dev, "Writing link TRB addr:%pKa to %pK (%x) for ep:%s\n",		dev_dbg(mdwc->dev, "Writing link TRB addr:%pKa to %pK (%x) for ep:%s\n",