diff options
| author |   Ben Dooks <ben-linux@fluff.org> | 2010-10-30 00:46:49 +0100 |
|---|---|---|
| committer | Ben Dooks <ben-linux@fluff.org> | 2010-10-30 00:46:49 +0100 |
| commit | 7c1552d196682f05abaa8e49f81c40a9b6459b67 (patch) | |
| tree | c052789b883435159c22708058e1ced9c0597113 /arch/arm/mach-s3c2410/h1940-bluetooth.c | |
| parent | ARM: Merge for-2637/s3c24xx/rx1950 (diff) | |
| parent | ARM: h1940: add UDA1380 to i2c devices list (diff) | |
| download | linux-dev-7c1552d196682f05abaa8e49f81c40a9b6459b67.tar.xz linux-dev-7c1552d196682f05abaa8e49f81c40a9b6459b67.zip | |
ARM: Merge for-2637/s3c24xx/h1940
Diffstat (limited to 'arch/arm/mach-s3c2410/h1940-bluetooth.c')
| -rw-r--r-- | arch/arm/mach-s3c2410/h1940-bluetooth.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/mach-s3c2410/h1940-bluetooth.c b/arch/arm/mach-s3c2410/h1940-bluetooth.c index 8cdeb14af592..8aa2f1902a94 100644 --- a/arch/arm/mach-s3c2410/h1940-bluetooth.c +++ b/arch/arm/mach-s3c2410/h1940-bluetooth.c @@ -30,7 +30,7 @@ static void h1940bt_enable(int on) { if (on) { /* Power on the chip */ - h1940_latch_control(0, H1940_LATCH_BLUETOOTH_POWER); + gpio_set_value(H1940_LATCH_BLUETOOTH_POWER, 1); /* Reset the chip */ mdelay(10); @@ -43,7 +43,7 @@ static void h1940bt_enable(int on) mdelay(10); gpio_set_value(S3C2410_GPH(1), 0); mdelay(10); - h1940_latch_control(H1940_LATCH_BLUETOOTH_POWER, 0); + gpio_set_value(H1940_LATCH_BLUETOOTH_POWER, 0); } } @@ -64,7 +64,14 @@ static int __devinit h1940bt_probe(struct platform_device *pdev) ret = gpio_request(S3C2410_GPH(1), dev_name(&pdev->dev)); if (ret) { - dev_err(&pdev->dev, "could not get GPH1\n");\ + dev_err(&pdev->dev, "could not get GPH1\n"); + return ret; + } + + ret = gpio_request(H1940_LATCH_BLUETOOTH_POWER, dev_name(&pdev->dev)); + if (ret) { + gpio_free(S3C2410_GPH(1)); + dev_err(&pdev->dev, "could not get BT_POWER\n"); return ret; } |