diff options
| author | Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com> | 2011-03-29 13:49:18 +0200 |
|---|---|---|
| committer | Robert Marklund <robert.marklund@stericsson.com> | 2011-10-05 11:17:32 +0200 |
| commit | c4ad636fc94e43f741b4301c6342bd0d8abf54f3 (patch) | |
| tree | 51ecdd836a810beef2b85f35cdb6e3c7bedd49f6 | |
| parent | a80a5c227967f7edca3a094e3a840a1b0be8c76e (diff) | |
staging: Add ST-Ericsson CG2900 driver
This patch adds support for the ST-Ericsson CG2900
Connectivity Combo controller (Bluetooth, FM, GPS).
Signed-off-by: Par-Gunnar Hjalmdahl <par-gunnar.p.hjalmdahl@stericsson.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Philippe Langlais <philippe.langlais@linaro.org>
| -rw-r--r-- | drivers/staging/cg2900/Kconfig | 4 | ||||
| -rw-r--r-- | drivers/staging/cg2900/devices-cg2900.c | 1 |
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: |