diff options
author | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-02-21 11:35:20 +0100 |
---|---|---|
committer | Dominik Sliwa <dominik.sliwa@toradex.com> | 2019-02-21 14:07:51 +0100 |
commit | 36735bb86a5e144603743bb800d7f69362d2ee2d (patch) | |
tree | 363158c7f80f3fc5a7690ca9d9ff6e5fcd7fa52e /patches/0062-acpi-gpio-remove/hci_intel.patch | |
parent | e7720369ef69376d1244b49373e34663eaa6b5a1 (diff) |
backports: reintroduce bluetooth support
Signed-off-by: Dominik Sliwa <dominik.sliwa@toradex.com>
Diffstat (limited to 'patches/0062-acpi-gpio-remove/hci_intel.patch')
-rw-r--r-- | patches/0062-acpi-gpio-remove/hci_intel.patch | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/patches/0062-acpi-gpio-remove/hci_intel.patch b/patches/0062-acpi-gpio-remove/hci_intel.patch index 9237ce97..32dfa6de 100644 --- a/patches/0062-acpi-gpio-remove/hci_intel.patch +++ b/patches/0062-acpi-gpio-remove/hci_intel.patch @@ -20,13 +20,12 @@ /* Provide to idev a hu reference which is used to run LPM * transactions (lpm suspend/resume) from PM callbacks. -@@ -1306,14 +1310,17 @@ static int intel_probe(struct platform_d - - idev->pdev = pdev; +@@ -1306,13 +1310,16 @@ static int intel_probe(struct platform_d + if (ret) + dev_dbg(&pdev->dev, "Unable to add GPIO mapping table\n"); +#if LINUX_VERSION_IS_GEQ(3,17,0) - idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset", - GPIOD_OUT_LOW); + idev->reset = devm_gpiod_get(&pdev->dev, "reset", GPIOD_OUT_LOW); if (IS_ERR(idev->reset)) { dev_err(&pdev->dev, "Unable to retrieve gpio\n"); return PTR_ERR(idev->reset); |