From 886e263497519bb5dad44e12d7c23dcd2be2ee3d Mon Sep 17 00:00:00 2001 From: Sachin Kamat Date: Fri, 27 Jul 2012 12:38:41 +0530 Subject: [PATCH] --- yaml --- r: 327495 b: refs/heads/master c: cd7cf78e9bef269ed482ad8ab572f197ae89af3c h: refs/heads/master i: 327493: 45947afebfb37649c00a8e106b2f431425d16e91 327491: c6f2f2cd20c99bed732fe95f1ed0e927855917cb 327487: ea26d1a695a77bb551d8ff9ffdccf81346a0620b v: v3 --- [refs] | 2 +- trunk/drivers/bluetooth/dtl1_cs.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 919b6ddcf987..9c12e583b20e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4f8d81584964730b08753da34f1e3fb7981cf742 +refs/heads/master: cd7cf78e9bef269ed482ad8ab572f197ae89af3c diff --git a/trunk/drivers/bluetooth/dtl1_cs.c b/trunk/drivers/bluetooth/dtl1_cs.c index 97a7784db4a2..036cb366fe6e 100644 --- a/trunk/drivers/bluetooth/dtl1_cs.c +++ b/trunk/drivers/bluetooth/dtl1_cs.c @@ -550,7 +550,7 @@ static int dtl1_probe(struct pcmcia_device *link) dtl1_info_t *info; /* Create new info device */ - info = kzalloc(sizeof(*info), GFP_KERNEL); + info = devm_kzalloc(&link->dev, sizeof(*info), GFP_KERNEL); if (!info) return -ENOMEM; @@ -569,7 +569,6 @@ static void dtl1_detach(struct pcmcia_device *link) dtl1_close(info); pcmcia_disable_device(link); - kfree(info); } static int dtl1_confcheck(struct pcmcia_device *p_dev, void *priv_data)