diff options
| author | Linaro CI <ci_notify@linaro.org> | 2022-12-26 01:54:38 +0000 |
|---|---|---|
| committer | Linaro CI <ci_notify@linaro.org> | 2022-12-26 01:54:38 +0000 |
| commit | 13334a31f56fb60201b1c6cfc001567d06dabe97 (patch) | |
| tree | 64debbfcb88353c64f91e5ba77518765d7c90ae2 /drivers/extcon/extcon-qcom-spmi-misc.c | |
| parent | 39dc8846619c24c3a430c73695094c39e9225199 (diff) | |
| parent | a0bcf59d5a883bf1ea5b4adc4b384dc6c71b5c19 (diff) | |
Merge remote-tracking branch 'msm8939/tracking-qcomlt-msm8939' into integration-linux-qcomltintegration-linux-qcomlt-20221226-024008-v6.2-rc1-252-g13334a31f56fb
# Conflicts:
# Documentation/devicetree/bindings/arm/qcom.yaml
# arch/arm64/boot/dts/qcom/Makefile
Diffstat (limited to 'drivers/extcon/extcon-qcom-spmi-misc.c')
| -rw-r--r-- | drivers/extcon/extcon-qcom-spmi-misc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/extcon/extcon-qcom-spmi-misc.c b/drivers/extcon/extcon-qcom-spmi-misc.c index eb02cb962b5e..f72e90ceca53 100644 --- a/drivers/extcon/extcon-qcom-spmi-misc.c +++ b/drivers/extcon/extcon-qcom-spmi-misc.c @@ -123,7 +123,7 @@ static int qcom_usb_extcon_probe(struct platform_device *pdev) if (ret) return ret; - info->id_irq = platform_get_irq_byname(pdev, "usb_id"); + info->id_irq = platform_get_irq_byname_optional(pdev, "usb_id"); if (info->id_irq > 0) { ret = devm_request_threaded_irq(dev, info->id_irq, NULL, qcom_usb_irq_handler, @@ -136,7 +136,7 @@ static int qcom_usb_extcon_probe(struct platform_device *pdev) } } - info->vbus_irq = platform_get_irq_byname(pdev, "usb_vbus"); + info->vbus_irq = platform_get_irq_byname_optional(pdev, "usb_vbus"); if (info->vbus_irq > 0) { ret = devm_request_threaded_irq(dev, info->vbus_irq, NULL, qcom_usb_irq_handler, |