From: Jeffy Chen Date: Mon, 23 Jan 2017 04:18:52 +0000 (+0800) Subject: btmrvl: set irq_bt to -1 when failed to parse it X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fd1a88da81d60a27960174bd9cda312c712961d1;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git btmrvl: set irq_bt to -1 when failed to parse it The irq_of_parse_and_map will return 0 as a invalid irq. Set irq_bt to -1 in this case, so that the btmrvl resume/suspend code would not try to enable/disable it. Signed-off-by: Jeffy Chen Reviewed-by: Brian Norris Signed-off-by: Marcel Holtmann --- diff --git a/drivers/bluetooth/btmrvl_sdio.c b/drivers/bluetooth/btmrvl_sdio.c index c738baeb6d45..796f7194a772 100644 --- a/drivers/bluetooth/btmrvl_sdio.c +++ b/drivers/bluetooth/btmrvl_sdio.c @@ -97,6 +97,7 @@ static int btmrvl_sdio_probe_of(struct device *dev, cfg->irq_bt = irq_of_parse_and_map(card->plt_of_node, 0); if (!cfg->irq_bt) { dev_err(dev, "fail to parse irq_bt from device tree"); + cfg->irq_bt = -1; } else { ret = devm_request_irq(dev, cfg->irq_bt, btmrvl_wake_irq_bt,