Re: [PATCH v4] Bluetooth: Add hci_h4p driver

[Pavel Machek]

Hi!

> You have missed some things. See inline comments below.

Ok, I've done this, it should fix the rest.

diff --git a/drivers/bluetooth/nokia_core.c b/drivers/bluetooth/nokia_core.c
index d6e9b3911..6615939 100644
--- a/drivers/bluetooth/nokia_core.c
+++ b/drivers/bluetooth/nokia_core.c
@@ -1138,8 +1138,8 @@ static int hci_h4p_probe(struct platform_device *pdev)
 	info->uart_iclk = devm_clk_get(&pdev->dev, bt_plat_data->uart_iclk);
 	info->uart_fclk = devm_clk_get(&pdev->dev, bt_plat_data->uart_fclk);
 
-	err = request_irq(info->irq, hci_h4p_interrupt, IRQF_DISABLED, "hci_h4p",
-			  info);
+	err = devm_request_irq(&pdev->dev, info->irq, hci_h4p_interrupt, IRQF_DISABLED,
+			       "hci_h4p", info);
 	if (err < 0) {
 		dev_err(info->dev, "hci_h4p: unable to get IRQ %d\n", info->irq);
 		return err;
@@ -1192,9 +1192,6 @@ static int hci_h4p_remove(struct platform_device *pdev)
 	hci_h4p_hci_close(info->hdev);
 	hci_unregister_dev(info->hdev);
 	hci_free_dev(info->hdev);
-	gpio_free(info->bt_wakeup_gpio);
-	gpio_free(info->host_wakeup_gpio);
-	free_irq(info->irq, (void *) info);
 
 	return 0;
 }



-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/