From mboxrd@z Thu Jan 1 00:00:00 1970 From: Bin Liu Subject: Re: [PATCH v3 15/16] usb: musb: da8xx: Use devm in probe Date: Fri, 1 Apr 2016 09:56:44 -0500 Message-ID: <20160401145644.GB6264@uda0271908> References: <1458863503-31121-1-git-send-email-david@lechnology.com> <1458863503-31121-16-git-send-email-david@lechnology.com> <20160331222112.GA28044@uda0271908> <56FDA4A0.6080106@lechnology.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Content-Disposition: inline In-Reply-To: <56FDA4A0.6080106-nq/r/kbU++upp/zk7JDF2g@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: David Lechner Cc: petr-Qh/3xLP0EvwAvxtiuMwx3w@public.gmane.org, sergei.shtylyov-M4DtvfQ/ZS1MRgGoP+s0PdBPR1lH4CV8@public.gmane.org, David.Laight-ZS65k/vG3HxXrIkS9f7CXA@public.gmane.org, Rob Herring , Pawel Moll , Mark Rutland , Ian Campbell , Kumar Gala , Russell King , Sekhar Nori , Kevin Hilman , Kishon Vijay Abraham I , Greg Kroah-Hartman , Alan Stern , Lee Jones , "open list:OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS" , open list , "moderated list:ARM PORT" , "open list:USB SUBSYSTEM" List-Id: devicetree@vger.kernel.org Hi, On Thu, Mar 31, 2016 at 05:28:48PM -0500, David Lechner wrote: > On 03/31/2016 05:21 PM, Bin Liu wrote: > > >>- glue = kzalloc(sizeof(*glue), GFP_KERNEL); > >>+ glue = devm_kzalloc(&pdev->dev, sizeof(*glue), GFP_KERNEL); > >> if (!glue) { > >> dev_err(&pdev->dev, "failed to allocate glue context\n"); > >>- goto err0; > >>+ return -ENOMEM; > >> } > >> > >>- clk = clk_get(&pdev->dev, "usb20"); > >>+ clk = devm_clk_get(&pdev->dev, "usb20"); > >> if (IS_ERR(clk)) { > >> dev_err(&pdev->dev, "failed to get clock\n"); > >>- ret = PTR_ERR(clk); > >>- goto err3; > >>+ return PTR_ERR(clk); > > > >memory leak due to not kfree(glue). > > It is my understanding that since glue is allocated with > devm_kzalloc(), that if the probe function returns and error, glue > and everything else allocated with devm_* will be automatically > freed. Ah, right. > > If this is not the case, wouldn't devm_kfree() be the appropriate > function instead? > > > >>@@ -576,8 +569,6 @@ static int da8xx_remove(struct platform_device *pdev) > >> platform_device_unregister(glue->musb); > >> usb_phy_generic_unregister(glue->phy); > >> clk_disable(glue->clk); > >>- clk_put(glue->clk); > >>- kfree(glue); > > > >Doesn't match with $subject, I'd put them into a seperate patch. > > > I disagree. Since these are now automatically freed because of > changes in the probe function, these changes belong in the same > patch. > Ok. Signed-off-by: Bin Liu Regards, -Bin. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html