From patchwork Sat May 30 17:07:21 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew de Quincey X-Patchwork-Id: 27064 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n4UH7PDx019343 for ; Sat, 30 May 2009 17:07:25 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751223AbZE3RHV (ORCPT ); Sat, 30 May 2009 13:07:21 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752182AbZE3RHV (ORCPT ); Sat, 30 May 2009 13:07:21 -0400 Received: from 82-71-49-12.dsl.in-addr.zen.co.uk ([82.71.49.12]:56521 "EHLO mail.lidskialf.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751223AbZE3RHV (ORCPT ); Sat, 30 May 2009 13:07:21 -0400 Received: from lidskialf.net (beyond.lidskialf.net [172.16.1.1]) by mail.lidskialf.net (Postfix) with ESMTP id 9B2074944D5BD for ; Sat, 30 May 2009 18:07:21 +0100 (BST) Received: from munin.lidskialf.net (munin.lidskialf.net [172.16.1.17]) by lidskialf.net (Horde Framework) with HTTP; Sat, 30 May 2009 18:07:21 +0100 Message-ID: <20090530180721.75203sfsqbpppfi8@lidskialf.net> Date: Sat, 30 May 2009 18:07:21 +0100 From: Andrew de Quincey To: linux-omap@vger.kernel.org Subject: prepatch: Fix brf6510 cleanup code MIME-Version: 1.0 User-Agent: Internet Messaging Program (IMP) H3 (4.3) Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org Hi, another cleanup patch from me; this one fixes the brf6150 cleanup code so the module can be unloaded cleanly and also doesn't cause an oops on reset. commit bf0e4cba53819df5590a88d551b35a2e79f4de75 Author: Andrew de Quincey Date: Sat May 30 18:01:58 2009 +0100 Fix brf6150 init/shutdown cleanup diff --git a/drivers/bluetooth/brf6150.c b/drivers/bluetooth/brf6150.c index f29caf5..4f0112a 100644 --- a/drivers/bluetooth/brf6150.c +++ b/drivers/bluetooth/brf6150.c @@ -312,7 +312,7 @@ static int brf6150_send_negotiation(struct brf6150_info *info) skb = brf6150_read_fw_cmd(info, GFP_KERNEL); if (!skb) { - printk(KERN_WARNING "Cannot read negoatiation message"); + printk(KERN_WARNING "Cannot read negotiation message"); return -1; } @@ -873,6 +873,7 @@ static int brf6150_register_hdev(struct brf6150_info *info) hdev->owner = THIS_MODULE; if (hci_register_dev(hdev) < 0) { + hci_free_dev(hdev); printk(KERN_WARNING "brf6150: Can't register HCI device %s.\n", hdev->name); return -ENODEV; } @@ -885,10 +886,9 @@ static int __init brf6150_init(void) struct brf6150_info *info; int irq, err; - info = kmalloc(sizeof(struct brf6150_info), GFP_KERNEL); + info = kzalloc(sizeof(struct brf6150_info), GFP_KERNEL); if (!info) return -ENOMEM; - memset(info, 0, sizeof(struct brf6150_info)); brf6150_device.dev.driver_data = info; init_completion(&info->init_completion); @@ -906,8 +906,11 @@ static int __init brf6150_init(void) exit_info = NULL; info->btinfo = omap_get_config(OMAP_TAG_NOKIA_BT, struct omap_bluetooth_config); - if (info->btinfo == NULL) + if (info->btinfo == NULL) { + tasklet_kill(&info->tx_task); + kfree(info); return -1; + } NBT_DBG("RESET gpio: %d\n", info->btinfo->reset_gpio); NBT_DBG("BTWU gpio: %d\n", info->btinfo->bt_wakeup_gpio); @@ -920,6 +923,7 @@ static int __init brf6150_init(void) { printk(KERN_WARNING "Cannot get GPIO line %d", info->btinfo->reset_gpio); + tasklet_kill(&info->tx_task); kfree(info); return err; } @@ -930,6 +934,7 @@ static int __init brf6150_init(void) printk(KERN_WARNING "Cannot get GPIO line 0x%d", info->btinfo->bt_wakeup_gpio); gpio_free(info->btinfo->reset_gpio); + tasklet_kill(&info->tx_task); kfree(info); return err; } @@ -941,6 +946,7 @@ static int __init brf6150_init(void) info->btinfo->host_wakeup_gpio); gpio_free(info->btinfo->reset_gpio); gpio_free(info->btinfo->bt_wakeup_gpio); + tasklet_kill(&info->tx_task); kfree(info); return err; } @@ -1027,6 +1033,7 @@ cleanup: gpio_free(info->btinfo->reset_gpio); gpio_free(info->btinfo->bt_wakeup_gpio); gpio_free(info->btinfo->host_wakeup_gpio); + tasklet_kill(&info->tx_task); kfree(info); return err; @@ -1035,12 +1042,16 @@ cleanup: static void __exit brf6150_exit(void) { brf6150_hci_close(exit_info->hdev); + hci_unregister_dev(exit_info->hdev); hci_free_dev(exit_info->hdev); gpio_free(exit_info->btinfo->reset_gpio); gpio_free(exit_info->btinfo->bt_wakeup_gpio); gpio_free(exit_info->btinfo->host_wakeup_gpio); free_irq(exit_info->irq, (void *)exit_info); free_irq(gpio_to_irq(exit_info->btinfo->host_wakeup_gpio), (void *)exit_info); + tasklet_kill(&exit_info->tx_task); + platform_device_unregister(&brf6150_device); + platform_driver_unregister(&brf6150_driver); kfree(exit_info); }