summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--drivers/staging/cg2900/Kconfig4
-rw-r--r--drivers/staging/cg2900/devices-cg2900.c1
2 files changed, 4 insertions, 1 deletions
diff --git a/drivers/staging/cg2900/Kconfig b/drivers/staging/cg2900/Kconfig
index 0d1ad7ca8d8..2a0d14c4fbe 100644
--- a/drivers/staging/cg2900/Kconfig
+++ b/drivers/staging/cg2900/Kconfig
@@ -32,7 +32,9 @@ config STLC2690_CHIP
config CG2900_UART
tristate "Support CG2900 UART transport"
- depends on CG2900 && BT
+ depends on CG2900
+ select BT
+ select BT_HCIUART
help
UART driver for ST-Ericsson CG2900 Connectivity Controller.
Contains functions for setting baud rate and to transport
diff --git a/drivers/staging/cg2900/devices-cg2900.c b/drivers/staging/cg2900/devices-cg2900.c
index 9917e6458c2..aaa07b734ef 100644
--- a/drivers/staging/cg2900/devices-cg2900.c
+++ b/drivers/staging/cg2900/devices-cg2900.c
@@ -275,6 +275,7 @@ static int dcg2900_init(struct cg2900_chip_dev *dev)
finished:
dev->b_data = info;
return 0;
+
err_handling_free_gpio_bt:
gpio_free(info->bt_gpio);
err_handling_free_gpio_gbf: