Merge "Bluetooth: Add conditional check before requesting gpio" (46942c38) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/bluetooth/btpower.c

+22 −17

Original line number	Diff line number	Diff line
		@@ -398,6 +398,10 @@ static int bt_configure_gpios(int on)
		bt_power_src_status[BT_RESET_GPIO] =
		gpio_get_value(bt_reset_gpio);
		}

		pr_info("xo_reset_gpio(%d)\n", xo_reset_gpio);

		if (xo_reset_gpio > 0) {
		rc = gpio_request(xo_reset_gpio, "xo_reset_gpio_n");
		if (rc) {
		pr_err("%s: unable to request gpio %d (%d)\n",
		@@ -419,6 +423,7 @@ static int bt_configure_gpios(int on)
		__func__);
		}
		}
		}
		msleep(50);
		/* Check if SW_CTRL is asserted */
		if (bt_sw_ctrl_gpio >= 0) {