diff options
| author | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:15:27 -0800 |
|---|---|---|
| committer | Luis R. Rodriguez <mcgrof@frijolero.org> | 2012-02-23 15:15:27 -0800 |
| commit | c9936afc2a4682105ddf04edacf4616d01eec22e (patch) | |
| tree | 0f121a2af7cab73f71273b64ce006683c2c97e6e /patches | |
| parent | b507d4fd7242d38c7b501387e5681e0299069842 (diff) | |
compat-wireless: fix patches/16-bluetooth.patch
Some context lines were removed from the upstream driver.
Signed-off-by: Luis R. Rodriguez <mcgrof@frijolero.org>
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/16-bluetooth.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/patches/16-bluetooth.patch b/patches/16-bluetooth.patch index be5c643c..3397b2d8 100644 --- a/patches/16-bluetooth.patch +++ b/patches/16-bluetooth.patch @@ -3,7 +3,7 @@ here still, but for now we keep this here. --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c -@@ -282,8 +282,13 @@ static int hci_uart_tty_open(struct tty_ +@@ -273,8 +273,13 @@ static int hci_uart_tty_open(struct tty_ /* FIXME: why is this needed. Note don't use ldisc_ref here as the open path is before the ldisc is referencable */ @@ -17,17 +17,17 @@ here still, but for now we keep this here. tty_driver_flush_buffer(tty); return 0; -@@ -398,7 +403,9 @@ static int hci_uart_register_dev(struct +@@ -390,7 +395,9 @@ static int hci_uart_register_dev(struct + hdev->close = hci_uart_close; hdev->flush = hci_uart_flush; hdev->send = hci_uart_send_frame; - hdev->destruct = hci_uart_destruct; +#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,37) hdev->parent = hu->tty->dev; +#endif - hdev->owner = THIS_MODULE; - -@@ -498,7 +505,11 @@ static int hci_uart_tty_ioctl(struct tty + if (!reset) + set_bit(HCI_QUIRK_NO_RESET, &hdev->quirks); +@@ -488,7 +495,11 @@ static int hci_uart_tty_ioctl(struct tty return hu->hdev_flags; default: |