diff options
Diffstat (limited to 'drivers/bluetooth/btuart_cs.c')
-rw-r--r-- | drivers/bluetooth/btuart_cs.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/bluetooth/btuart_cs.c b/drivers/bluetooth/btuart_cs.c index 21e803a6a281..35a553a90616 100644 --- a/drivers/bluetooth/btuart_cs.c +++ b/drivers/bluetooth/btuart_cs.c | |||
@@ -446,7 +446,7 @@ static int btuart_hci_send_frame(struct sk_buff *skb) | |||
446 | case HCI_SCODATA_PKT: | 446 | case HCI_SCODATA_PKT: |
447 | hdev->stat.sco_tx++; | 447 | hdev->stat.sco_tx++; |
448 | break; | 448 | break; |
449 | }; | 449 | } |
450 | 450 | ||
451 | /* Prepend skb with frame type */ | 451 | /* Prepend skb with frame type */ |
452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); | 452 | memcpy(skb_push(skb, 1), &bt_cb(skb)->pkt_type, 1); |
@@ -567,7 +567,7 @@ static int btuart_probe(struct pcmcia_device *link) | |||
567 | btuart_info_t *info; | 567 | btuart_info_t *info; |
568 | 568 | ||
569 | /* Create new info device */ | 569 | /* Create new info device */ |
570 | info = kzalloc(sizeof(*info), GFP_KERNEL); | 570 | info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL); |
571 | if (!info) | 571 | if (!info) |
572 | return -ENOMEM; | 572 | return -ENOMEM; |
573 | 573 | ||
@@ -583,10 +583,7 @@ static int btuart_probe(struct pcmcia_device *link) | |||
583 | 583 | ||
584 | static void btuart_detach(struct pcmcia_device *link) | 584 | static void btuart_detach(struct pcmcia_device *link) |
585 | { | 585 | { |
586 | btuart_info_t *info = link->priv; | ||
587 | |||
588 | btuart_release(link); | 586 | btuart_release(link); |
589 | kfree(info); | ||
590 | } | 587 | } |
591 | 588 | ||
592 | static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) | 589 | static int btuart_check_config(struct pcmcia_device *p_dev, void *priv_data) |