diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:39:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-09-24 14:39:16 -0400 |
| commit | 791ef39cd18ae2745a63c51a5dbbd23312be0744 (patch) | |
| tree | 195a547ce1bde51ba3f37cd771648c18d84cc947 /drivers/bluetooth/hci_ldisc.c | |
| parent | e5a876250d05d9708895da3d5408bdf67f1180f3 (diff) | |
| parent | 0c1abbd1aa0416258881c303a88e618cbca0759c (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
| -rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index 74e0966b3ead..c8abce3d2d9c 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -531,7 +531,7 @@ static int hci_uart_tty_ioctl(struct tty_struct *tty, struct file * file, default: err = n_tty_ioctl_helper(tty, file, cmd, arg); break; - }; + } return err; } |