usb: typec: qcom-pmic: init value of hdr_len/txbuf_len earlier
authorRex Nie <rex.nie@jaguarmicro.com>
Wed, 30 Oct 2024 13:36:32 +0000 (21:36 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Nov 2024 12:54:54 +0000 (13:54 +0100)
If the read of USB_PDPHY_RX_ACKNOWLEDGE_REG failed, then hdr_len and
txbuf_len are uninitialized. This commit stops to print uninitialized
value and misleading/false data.

Cc: stable@vger.kernel.org
Fixes: a4422ff22142 (" usb: typec: qcom: Add Qualcomm PMIC Type-C driver")
Signed-off-by: Rex Nie <rex.nie@jaguarmicro.com>
Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Reviewed-by: Bjorn Andersson <andersson@kernel.org>
Acked-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://lore.kernel.org/r/20241030133632.2116-1-rex.nie@jaguarmicro.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c

index 5b7f52b74a40aa70096499e34d6c32a38c08fd48..726423684bae0a690bd20547313704b7d2f4cfdc 100644 (file)
@@ -227,6 +227,10 @@ qcom_pmic_typec_pdphy_pd_transmit_payload(struct pmic_typec_pdphy *pmic_typec_pd
 
        spin_lock_irqsave(&pmic_typec_pdphy->lock, flags);
 
+       hdr_len = sizeof(msg->header);
+       txbuf_len = pd_header_cnt_le(msg->header) * 4;
+       txsize_len = hdr_len + txbuf_len - 1;
+
        ret = regmap_read(pmic_typec_pdphy->regmap,
                          pmic_typec_pdphy->base + USB_PDPHY_RX_ACKNOWLEDGE_REG,
                          &val);
@@ -244,10 +248,6 @@ qcom_pmic_typec_pdphy_pd_transmit_payload(struct pmic_typec_pdphy *pmic_typec_pd
        if (ret)
                goto done;
 
-       hdr_len = sizeof(msg->header);
-       txbuf_len = pd_header_cnt_le(msg->header) * 4;
-       txsize_len = hdr_len + txbuf_len - 1;
-
        /* Write message header sizeof(u16) to USB_PDPHY_TX_BUFFER_HDR_REG */
        ret = regmap_bulk_write(pmic_typec_pdphy->regmap,
                                pmic_typec_pdphy->base + USB_PDPHY_TX_BUFFER_HDR_REG,