From: Andrew Morton Nobody's xterm is that wide. Cc: Olivier Galibert Cc: Pavel Machek Cc: Marcel Holtmann Cc: Greg KH Signed-off-by: Andrew Morton --- net/bluetooth/hci_event.c | 15 +++++++++++---- bluetooth/hci_usb.c | 0 bluetooth/hci_usb.h | 0 net/bluetooth/hci_core.h | 0 4 files changed, 11 insertions(+), 4 deletions(-) diff -puN drivers/bluetooth/hci_usb.c~fix-sco-on-some-bluetooth-adapters-tidy drivers/bluetooth/hci_usb.c diff -puN drivers/bluetooth/hci_usb.h~fix-sco-on-some-bluetooth-adapters-tidy drivers/bluetooth/hci_usb.h diff -puN include/net/bluetooth/hci_core.h~fix-sco-on-some-bluetooth-adapters-tidy include/net/bluetooth/hci_core.h diff -puN net/bluetooth/hci_event.c~fix-sco-on-some-bluetooth-adapters-tidy net/bluetooth/hci_event.c --- 25/net/bluetooth/hci_event.c~fix-sco-on-some-bluetooth-adapters-tidy Fri Apr 21 13:54:12 2006 +++ 25-akpm/net/bluetooth/hci_event.c Fri Apr 21 13:54:12 2006 @@ -327,10 +327,17 @@ static void hci_cc_info_param(struct hci if (hdev->quirk_read_buffer_size) hdev->quirk_read_buffer_size(hdev); - if (!hdev->acl_mtu || !hdev->sco_mtu || !hdev->acl_pkts || !hdev->sco_pkts) { - printk (KERN_WARNING "Your Bluetooth adapter has an incorrect OCF_READ_BUFFER_SIZE reply (%d:%d, %d:%d)\n", - hdev->acl_mtu, hdev->acl_pkts, hdev->sco_mtu, hdev->sco_pkts); - printk (KERN_WARNING "It won't work correctly. Please contact Marcel Holtmann with information about your device to try workarounds.\n"); + if (!hdev->acl_mtu || !hdev->sco_mtu || !hdev->acl_pkts || + !hdev->sco_pkts) { + printk(KERN_WARNING "Your Bluetooth adapter has an " + "incorrect OCF_READ_BUFFER_SIZE reply " + "(%d:%d, %d:%d)\n", + hdev->acl_mtu, hdev->acl_pkts, hdev->sco_mtu, + hdev->sco_pkts); + printk(KERN_WARNING "It won't work correctly. Please " + "contact Marcel Holtmann " + "with information about your device to try " + "workarounds.\n"); } hdev->acl_cnt = hdev->acl_pkts; _