diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/bluetooth/hci_ldisc.c | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 4895f0e05322..76a1abb8f214 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c | |||
| @@ -214,7 +214,7 @@ static int hci_uart_send_frame(struct sk_buff *skb) | |||
| 214 | struct hci_uart *hu; | 214 | struct hci_uart *hu; |
| 215 | 215 | ||
| 216 | if (!hdev) { | 216 | if (!hdev) { |
| 217 | BT_ERR("Frame for uknown device (hdev=NULL)"); | 217 | BT_ERR("Frame for unknown device (hdev=NULL)"); |
| 218 | return -ENODEV; | 218 | return -ENODEV; |
| 219 | } | 219 | } |
| 220 | 220 | ||
| @@ -383,7 +383,7 @@ static int hci_uart_register_dev(struct hci_uart *hu) | |||
| 383 | 383 | ||
| 384 | hu->hdev = hdev; | 384 | hu->hdev = hdev; |
| 385 | 385 | ||
| 386 | hdev->type = HCI_UART; | 386 | hdev->bus = HCI_UART; |
| 387 | hdev->driver_data = hu; | 387 | hdev->driver_data = hu; |
| 388 | 388 | ||
| 389 | hdev->open = hci_uart_open; | 389 | hdev->open = hci_uart_open; |