fix up 4.4 and 4.9 bluetooth backport

diff --git a/queue-4.4/bluetooth-hci_uart-check-for-missing-tty-operations.patch b/queue-4.4/bluetooth-hci_uart-check-for-missing-tty-operations.patch
index 1fb1f293656087aec3ec73218b8c8655a425e071..6e43117a547fdccae48abf2674861d473bee58d0 100644 (file)
--- a/queue-4.4/bluetooth-hci_uart-check-for-missing-tty-operations.patch
+++ b/queue-4.4/bluetooth-hci_uart-check-for-missing-tty-operations.patch
@@ -37,9 +37,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  drivers/bluetooth/hci_ath.c   |    3 +++
  drivers/bluetooth/hci_bcm.c   |    3 +++
  drivers/bluetooth/hci_intel.c |    3 +++
- drivers/bluetooth/hci_ldisc.c |   13 +++++++++++++
+ drivers/bluetooth/hci_ldisc.c |    9 +++++++++
  drivers/bluetooth/hci_uart.h  |    1 +
- 5 files changed, 23 insertions(+)
+ 5 files changed, 19 insertions(+)
 
 --- a/drivers/bluetooth/hci_ath.c
 +++ b/drivers/bluetooth/hci_ath.c
@@ -79,17 +79,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return -ENOMEM;
 --- a/drivers/bluetooth/hci_ldisc.c
 +++ b/drivers/bluetooth/hci_ldisc.c
-@@ -257,6 +257,19 @@ static int hci_uart_send_frame(struct hc
+@@ -257,6 +257,15 @@ static int hci_uart_send_frame(struct hc
        return 0;
  }
  
 +/* Check the underlying device or tty has flow control support */
 +bool hci_uart_has_flow_control(struct hci_uart *hu)
 +{
-+      /* serdev nodes check if the needed operations are present */
-+      if (hu->serdev)
-+              return true;
-+
 +      if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset)
 +              return true;
 +

diff --git a/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch b/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch
index 9c6e320ab9fc37316cf9aeaff55c2e708cdcb136..41d5753839e257bce0940fd6267db3842e1c2f4b 100644 (file)
--- a/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch
+++ b/queue-4.9/bluetooth-hci_uart-check-for-missing-tty-operations.patch
@@ -37,10 +37,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  drivers/bluetooth/hci_ath.c   |    3 +++
  drivers/bluetooth/hci_bcm.c   |    3 +++
  drivers/bluetooth/hci_intel.c |    3 +++
- drivers/bluetooth/hci_ldisc.c |   13 +++++++++++++
+ drivers/bluetooth/hci_ldisc.c |    9 +++++++++
  drivers/bluetooth/hci_mrvl.c  |    3 +++
  drivers/bluetooth/hci_uart.h  |    1 +
- 6 files changed, 26 insertions(+)
+ 6 files changed, 22 insertions(+)
 
 --- a/drivers/bluetooth/hci_ath.c
 +++ b/drivers/bluetooth/hci_ath.c
@@ -80,17 +80,13 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
                return -ENOMEM;
 --- a/drivers/bluetooth/hci_ldisc.c
 +++ b/drivers/bluetooth/hci_ldisc.c
-@@ -263,6 +263,19 @@ static int hci_uart_send_frame(struct hc
+@@ -263,6 +263,15 @@ static int hci_uart_send_frame(struct hc
        return 0;
  }
  
 +/* Check the underlying device or tty has flow control support */
 +bool hci_uart_has_flow_control(struct hci_uart *hu)
 +{
-+      /* serdev nodes check if the needed operations are present */
-+      if (hu->serdev)
-+              return true;
-+
 +      if (hu->tty->driver->ops->tiocmget && hu->tty->driver->ops->tiocmset)
 +              return true;
 +