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

Commit 1872eeb6 authored by qctecmdr Service's avatar qctecmdr Service Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: pd: Fix compile warnings"

parents 629ddd59 e06f5e75

drivers/thermal/qcom/adc-tm5.c

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ static int32_t adc_tm5_thr_update(struct adc_tm_sensor *sensor, 
	uint16_t reg_low_thr_lsb, reg_high_thr_lsb;

	uint32_t scale_type = 0, mask = 0, btm_chan_idx = 0;

	struct adc_tm_config tm_config;

	struct adc_tm_chip *chip;

	struct adc_tm_chip *chip = NULL;



	ret = adc_tm5_get_btm_idx(chip,

		sensor->btm_ch, &btm_chan_idx);

drivers/usb/pd/policy_engine.c

+2 −2
Original line number Diff line number Diff line
@@ -4266,7 +4266,7 @@ static int trigger_tx_msg(struct usbpd *pd, bool *msg_tx_flag) 


	/* Only allowed if we are already in explicit sink contract */

	if (pd->current_state != PE_SNK_READY || !is_sink_tx_ok(pd)) {

		usbpd_err(&pd->dev, "%s: Cannot send msg\n");

		usbpd_err(&pd->dev, "Cannot send msg\n");

		ret = -EBUSY;

		goto out;

	}
@@ -4278,7 +4278,7 @@ static int trigger_tx_msg(struct usbpd *pd, bool *msg_tx_flag) 
	/* wait for operation to complete */

	if (!wait_for_completion_timeout(&pd->is_ready,

			msecs_to_jiffies(1000))) {

		usbpd_err(&pd->dev, "%s: request timed out\n");

		usbpd_err(&pd->dev, "request timed out\n");

		ret = -ETIMEDOUT;

	}