Hi Dave,

here are some minor additional fixes that should go into 2.6.22 before
Linus closes the merge window.

Regards

Marcel


Please pull from

        git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6.git

This will update the following files:

 drivers/bluetooth/hci_ldisc.c |   10 +++++++++-
 drivers/bluetooth/hci_uart.h  |    5 +++--
 net/bluetooth/hidp/core.c     |   10 +++++-----
 3 files changed, 17 insertions(+), 8 deletions(-)

through these ChangeSets:

Commit: 19242490ea04586d581113dd8895ba2ebed75c9b 
Author: Marcel Holtmann <[EMAIL PROTECTED]> Wed, 09 May 2007 09:15:45 +0200 

    [Bluetooth] Fix unintentional fall-through in HCI line discipline
    
    A trivial fix to (what looks like) an unintentional fall-through in the
    HCI line discipline.
    
    Signed-off-by: Ohad Ben-Cohen <[EMAIL PROTECTED]>
    Signed-off-by: Marcel Holtmann <[EMAIL PROTECTED]>

Commit: d4c2c832c4a2247a9e9a320d4da4532a6ebfebb3 
Author: Marcel Holtmann <[EMAIL PROTECTED]> Wed, 09 May 2007 09:15:40 +0200 

    [Bluetooth] Fix NULL pointer dereference in HCI line discipline
    
    Normally a serial Bluetooth device is opened, TIOSETD'ed to N_HCI line
    discipline, HCIUARTSETPROTO'ed and finally closed. In case the device
    fails to HCIUARTSETPROTO, closing it produces a NULL pointer dereference.
    
    Signed-off-by: Ohad Ben-Cohen <[EMAIL PROTECTED]>
    Signed-off-by: Marcel Holtmann <[EMAIL PROTECTED]>

Commit: ecbe531f666e08d41eb6f0ef8e2eb8dca5aa99d5 
Author: Marcel Holtmann <[EMAIL PROTECTED]> Wed, 09 May 2007 09:15:35 +0200 

    [Bluetooth] Add HCIUARTGETDEVICE support for HCI line discipline
    
    Adding HCIUARTGETDEVICE makes it possible to get the HCI device number
    that is attached to a given serial device. This is required during the
    initialization process of some Bluetooth chips.
    
    Signed-off-by: Ohad Ben-Cohen <[EMAIL PROTECTED]>
    Signed-off-by: Marcel Holtmann <[EMAIL PROTECTED]>

Commit: 30168f98fb48b3cce14900c153781cef41eea363 
Author: Marcel Holtmann <[EMAIL PROTECTED]> Wed, 09 May 2007 09:15:30 +0200 

    [Bluetooth] Switch to using input_dev->dev.parent
    
    In preparation for struct class_device -> struct device input core
    conversion, switch to using input_dev->dev.parent when specifying
    device position in sysfs tree.
    
    Also, do not access input_dev->private directly, use helpers and
    do not use kfree() on input device, use input_free_device() instead.
    
    Signed-off-by: Dmitry Torokhov <[EMAIL PROTECTED]>
    Signed-off-by: Marcel Holtmann <[EMAIL PROTECTED]>



-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to