[PATCH] hostap: Fix null pointer dereference in prism2_pccard_card_present()

[mv-sheeva.git] / drivers / bluetooth / hci_ldisc.c

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 9075bbb56ad4322d123d42a8f5e77e68e7a964f2..90be2eae52e0f99ae1c5cdb36420f16eac560c34 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -57,8 +57,6 @@
 #ifndef CONFIG_BT_HCIUART_DEBUG
 #undef  BT_DBG
 #define BT_DBG( A... )
-#undef  BT_DMP
-#define BT_DMP( A... )
 #endif
 
 static int reset = 0;
@@ -576,7 +574,7 @@ static void __exit hci_uart_exit(void)
 #endif
 
        /* Release tty registration of line discipline */
-       if ((err = tty_register_ldisc(N_HCI, NULL)))
+       if ((err = tty_unregister_ldisc(N_HCI)))
                BT_ERR("Can't unregister HCI line discipline (%d)", err);
 }