Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9927ec3d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "misc: apq8084_dock: Fix GPIO contention with audio""

parents 5a85289e 24262329

drivers/misc/apq8084_dock.c

+4 −0
Original line number Diff line number Diff line
@@ -86,6 +86,10 @@ static int apq8084_dock_probe(struct platform_device *pdev) 
		return dock->dock_detect;

	}



	ret = devm_gpio_request(dock->dev, dock->dock_detect, "dock_detect");

	if (ret)

		return ret;



	ret = devm_request_irq(&pdev->dev, gpio_to_irq(dock->dock_detect),

				dock_detected, IRQF_TRIGGER_RISING |

				IRQF_TRIGGER_FALLING | IRQF_SHARED,