projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fiq_debugger: merge from linux 3.10
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
bluetooth
/
hci_intel.c
diff --git
a/drivers/bluetooth/hci_intel.c
b/drivers/bluetooth/hci_intel.c
index 4a414a5a31655a4d3d0a8a0b03749ef73ff14357..b9065506a847da6f3eaf0c6ccb1cfd2f3640d74a 100644
(file)
--- a/
drivers/bluetooth/hci_intel.c
+++ b/
drivers/bluetooth/hci_intel.c
@@
-1234,8
+1234,7
@@
static int intel_probe(struct platform_device *pdev)
idev->pdev = pdev;
idev->pdev = pdev;
- 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);
if (IS_ERR(idev->reset)) {
dev_err(&pdev->dev, "Unable to retrieve gpio\n");
return PTR_ERR(idev->reset);
@@
-1247,8
+1246,7
@@
static int intel_probe(struct platform_device *pdev)
dev_err(&pdev->dev, "No IRQ, falling back to gpio-irq\n");
dev_err(&pdev->dev, "No IRQ, falling back to gpio-irq\n");
- host_wake = devm_gpiod_get_optional(&pdev->dev, "host-wake",
- GPIOD_IN);
+ host_wake = devm_gpiod_get(&pdev->dev, "host-wake", GPIOD_IN);
if (IS_ERR(host_wake)) {
dev_err(&pdev->dev, "Unable to retrieve IRQ\n");
goto no_irq;
if (IS_ERR(host_wake)) {
dev_err(&pdev->dev, "Unable to retrieve IRQ\n");
goto no_irq;