shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 19:30:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

phy: rockchip: usbdp-phy: add pointer check, avoid NULL pointer

Browse Source 
When enter DP mode, exit DP mode, disconnect device, the data
is NULL. And only check the hpd is connect, set the gpio.

Signed-off-by: Zhang Yubing <yubing.zhang@rock-chips.com>
Change-Id: I7a3558c5ee5f954055fdd5edbbd50b5079d8f323
This commit is contained in:
Zhang Yubing
2021-11-14 10:58:06 +08:00
committed by Tao Huang
parent 3fb391ad45
commit 8081c70a82
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/phy/rockchip/phy-rockchip-usbdp.c
View File

@@ -805,16 +805,6 @@ static int usbdp_typec_mux_set(struct typec_mux *mux,
break;
}
if (udphy->sbu1_dc_gpio && udphy->sbu1_dc_gpio) {
if (udphy->flip) {
gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 1);
gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 0);
} else {
gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 0);
gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 1);
}
}
if (udphy->mode != mode) {
udphy->mode = mode;
udphy->mode_change = true;
@@ -823,7 +813,17 @@ static int usbdp_typec_mux_set(struct typec_mux *mux,
if (state->alt && state->alt->svid == USB_TYPEC_DP_SID) {
struct typec_displayport_data *data = state->data;
bool hpd = !!(data->status & DP_STATUS_HPD_STATE);
bool hpd = !!(data && (data->status & DP_STATUS_HPD_STATE));
if (hpd && udphy->sbu1_dc_gpio && udphy->sbu1_dc_gpio) {
if (udphy->flip) {
gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 1);
gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 0);
} else {
gpiod_set_value_cansleep(udphy->sbu1_dc_gpio, 0);
gpiod_set_value_cansleep(udphy->sbu2_dc_gpio, 1);
}
}
if (cfg->hpd_event_trigger)
cfg->hpd_event_trigger(udphy, hpd);