On Wed, Sep 25, 2024 at 09:25:04AM -0700, Abhishek Pandit-Subedi wrote:
> Make sure the data pointer in typec_mux_state is not null before
> accessing it.
This really should not be necessary.
> Signed-off-by: Abhishek Pandit-Subedi <abhishekpandit@xxxxxxxxxxxx>
> ---
>
> drivers/usb/typec/mux/intel_pmc_mux.c | 9 +++++++--
> 1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/usb/typec/mux/intel_pmc_mux.c b/drivers/usb/typec/mux/intel_pmc_mux.c
> index 56989a0d0f43..4283fead9a69 100644
> --- a/drivers/usb/typec/mux/intel_pmc_mux.c
> +++ b/drivers/usb/typec/mux/intel_pmc_mux.c
> @@ -331,14 +331,19 @@ static int
> pmc_usb_mux_tbt(struct pmc_usb_port *port, struct typec_mux_state *state)
> {
> struct typec_thunderbolt_data *data = state->data;
> - u8 cable_rounded = TBT_CABLE_ROUNDED_SUPPORT(data->cable_mode);
> - u8 cable_speed = TBT_CABLE_SPEED(data->cable_mode);
> + u8 cable_rounded, cable_speed;
> struct altmode_req req = { };
>
> + if (!data)
> + return 0;
> +
> if (IOM_PORT_ACTIVITY_IS(port->iom_status, TBT) ||
> IOM_PORT_ACTIVITY_IS(port->iom_status, ALT_MODE_TBT_USB))
> return 0;
>
> + cable_rounded = TBT_CABLE_ROUNDED_SUPPORT(data->cable_mode);
> + cable_speed = TBT_CABLE_SPEED(data->cable_mode);
> +
> req.usage = PMC_USB_ALT_MODE;
> req.usage |= port->usb3_port << PMC_USB_MSG_USB3_PORT_SHIFT;
> req.mode_type = PMC_USB_MODE_TYPE_TBT << PMC_USB_MODE_TYPE_SHIFT;
> --
> 2.46.0.792.g87dc391469-goog
--
heikki
