summaryrefslogtreecommitdiff
path: root/patches/0062-acpi-gpio-remove/hci_intel.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0062-acpi-gpio-remove/hci_intel.patch')
-rw-r--r--patches/0062-acpi-gpio-remove/hci_intel.patch9
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);