]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
extcon: ptn5150: Fix usage of atomic GPIO with sleeping GPIO chips
authorKrzysztof Kozlowski <krzk@kernel.org>
Mon, 17 Aug 2020 07:00:00 +0000 (09:00 +0200)
committerStefan Bader <stefan.bader@canonical.com>
Thu, 10 Dec 2020 11:03:03 +0000 (12:03 +0100)
BugLink: https://bugs.launchpad.net/bugs/1904450
commit 6aaad58c872db062f7ea2761421ca748bd0931cc upstream.

The driver uses atomic version of gpiod_set_value() without any real
reason.  It is called in a workqueue under mutex so it could sleep
there.  Changing it to "can_sleep" flavor allows to use the driver with
all GPIO chips.

Fixes: 4ed754de2d66 ("extcon: Add support for ptn5150 extcon driver")
Cc: <stable@vger.kernel.org>
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Vijai Kumar K <vijaikumar.kanagarajan@gmail.com>
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: William Breathitt Gray <william.gray@canonical.com>
drivers/extcon/extcon-ptn5150.c

index d1c997599390acff66680a41ef46b14d4264e884..5f52527526441ba7d791f30320a5334a52d1727e 100644 (file)
@@ -127,7 +127,7 @@ static void ptn5150_irq_work(struct work_struct *work)
                        case PTN5150_DFP_ATTACHED:
                                extcon_set_state_sync(info->edev,
                                                EXTCON_USB_HOST, false);
-                               gpiod_set_value(info->vbus_gpiod, 0);
+                               gpiod_set_value_cansleep(info->vbus_gpiod, 0);
                                extcon_set_state_sync(info->edev, EXTCON_USB,
                                                true);
                                break;
@@ -138,9 +138,9 @@ static void ptn5150_irq_work(struct work_struct *work)
                                        PTN5150_REG_CC_VBUS_DETECTION_MASK) >>
                                        PTN5150_REG_CC_VBUS_DETECTION_SHIFT);
                                if (vbus)
-                                       gpiod_set_value(info->vbus_gpiod, 0);
+                                       gpiod_set_value_cansleep(info->vbus_gpiod, 0);
                                else
-                                       gpiod_set_value(info->vbus_gpiod, 1);
+                                       gpiod_set_value_cansleep(info->vbus_gpiod, 1);
 
                                extcon_set_state_sync(info->edev,
                                                EXTCON_USB_HOST, true);
@@ -156,7 +156,7 @@ static void ptn5150_irq_work(struct work_struct *work)
                                        EXTCON_USB_HOST, false);
                        extcon_set_state_sync(info->edev,
                                        EXTCON_USB, false);
-                       gpiod_set_value(info->vbus_gpiod, 0);
+                       gpiod_set_value_cansleep(info->vbus_gpiod, 0);
                }
        }