diff options
| author | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:40:54 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@stericsson.com> | 2011-09-19 15:40:54 +0200 |
| commit | 9ab67899804448f2bea4087bb6e9e4d952a79258 (patch) | |
| tree | 29ca9054d473e57f6d79638d1d3982f1ffcffcca /net/bluetooth/lib.c | |
| parent | 0de20dc0be1f147959b10903c76f2f41139f417a (diff) | |
| parent | f5968c8833f0985b76d38593892acd6558bab149 (diff) | |
Merge linux-linaro-3.0-2011.07-1-android-1 into..
..linux-linaro-3.0-2011.07-1_glk3.0
Conflicts:
arch/arm/common/Makefile
drivers/misc/Kconfig
drivers/misc/Makefile
kernel/printk.c
Change-Id: I126f34edb1879981909072beefb2738cad26f951
Diffstat (limited to 'net/bluetooth/lib.c')
| -rw-r--r-- | net/bluetooth/lib.c | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/net/bluetooth/lib.c b/net/bluetooth/lib.c index b826d1bf10d..86a6bed229d 100644 --- a/net/bluetooth/lib.c +++ b/net/bluetooth/lib.c @@ -59,7 +59,7 @@ char *batostr(bdaddr_t *ba) EXPORT_SYMBOL(batostr); /* Bluetooth error codes to Unix errno mapping */ -int bt_err(__u16 code) +int bt_to_errno(__u16 code) { switch (code) { case 0: @@ -149,4 +149,23 @@ int bt_err(__u16 code) return ENOSYS; } } -EXPORT_SYMBOL(bt_err); +EXPORT_SYMBOL(bt_to_errno); + +int bt_printk(const char *level, const char *format, ...) +{ + struct va_format vaf; + va_list args; + int r; + + va_start(args, format); + + vaf.fmt = format; + vaf.va = &args; + + r = printk("%sBluetooth: %pV\n", level, &vaf); + + va_end(args); + + return r; +} +EXPORT_SYMBOL(bt_printk); |