summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans de Goede <hdegoede@redhat.com>2018-02-13 20:25:50 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-02-28 10:19:39 +0100
commit606f74e3d01b39ab2b602102d2c56a1ef9c9b3b1 (patch)
treeeb8ee178de46a063b82adeb0b57a001907b228ec
parent29e76b211e9231e1d565551de84d9abd6eff5658 (diff)
downloadlinux-stable-606f74e3d01b39ab2b602102d2c56a1ef9c9b3b1.tar.gz
linux-stable-606f74e3d01b39ab2b602102d2c56a1ef9c9b3b1.tar.bz2
linux-stable-606f74e3d01b39ab2b602102d2c56a1ef9c9b3b1.zip
extcon: int3496: process id-pin first so that we start with the right status
commit 0434352d3d2e950cf5e743f6062abd87de22f960 upstream. Some other drivers may be waiting for our extcon to show-up, exiting their probe methods with -EPROBE_DEFER until we show up. These drivers will typically get the cable state directly after getting the extcon, this commit changes the int3496 code to wait for the initial processing of the id-pin to complete before exiting probe() with 0, which will cause devices waiting on the defered probe to get reprobed. This fixes a race where the initial work might still be running while other drivers were already calling extcon_get_state(). Fixes: 2f556bdb9f2e ("extcon: int3496: Add Intel INT3496 ACPI ... driver") Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/extcon/extcon-intel-int3496.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/extcon/extcon-intel-int3496.c b/drivers/extcon/extcon-intel-int3496.c
index 1a45e745717d..a6661097b2f9 100644
--- a/drivers/extcon/extcon-intel-int3496.c
+++ b/drivers/extcon/extcon-intel-int3496.c
@@ -153,8 +153,9 @@ static int int3496_probe(struct platform_device *pdev)
return ret;
}
- /* queue initial processing of id-pin */
+ /* process id-pin so that we start with the right status */
queue_delayed_work(system_wq, &data->work, 0);
+ flush_delayed_work(&data->work);
platform_set_drvdata(pdev, data);