| Message ID | 1474367987-15808-1-git-send-email-arvind.yadav.cs@gmail.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Delegated to: | Stephen Boyd |
| Headers | show |
Hi Arvind, On 20 September 2016 at 12:39, Arvind Yadav <arvind.yadav.cs@gmail.com> wrote: > From: Arvind Yadav <arvind.yadav.cs@gmail.com> > > Free memory mapping, if lpc18xx_ccu_init is not successful. > > Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> Acked-by: Joachim Eastwood <manabian@gmail.com> One comment below: > --- > drivers/clk/nxp/clk-lpc18xx-ccu.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/nxp/clk-lpc18xx-ccu.c b/drivers/clk/nxp/clk-lpc18xx-ccu.c > index f7136b9..27781b4 100644 > --- a/drivers/clk/nxp/clk-lpc18xx-ccu.c > +++ b/drivers/clk/nxp/clk-lpc18xx-ccu.c > @@ -277,12 +277,15 @@ static void __init lpc18xx_ccu_init(struct device_node *np) > } > > clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); > - if (!clk_data) > + if (!clk_data) { > + iounmap(reg_base); > return; > + } You could also move the kzalloc() at the beginning of the function to save a few lines. I am fine either way. > > clk_data->num = of_property_count_strings(np, "clock-names"); > clk_data->name = kcalloc(clk_data->num, sizeof(char *), GFP_KERNEL); > if (!clk_data->name) { > + iounmap(reg_base); > kfree(clk_data); > return; > } regards, Joachim Eastwood -- To unsubscribe from this list: send the line "unsubscribe linux-clk" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 09/20, Arvind Yadav wrote: > From: Arvind Yadav <arvind.yadav.cs@gmail.com> > > Free memory mapping, if lpc18xx_ccu_init is not successful. > > Signed-off-by: Arvind Yadav <arvind.yadav.cs@gmail.com> > --- Applied to clk-next
diff --git a/drivers/clk/nxp/clk-lpc18xx-ccu.c b/drivers/clk/nxp/clk-lpc18xx-ccu.c index f7136b9..27781b4 100644 --- a/drivers/clk/nxp/clk-lpc18xx-ccu.c +++ b/drivers/clk/nxp/clk-lpc18xx-ccu.c @@ -277,12 +277,15 @@ static void __init lpc18xx_ccu_init(struct device_node *np) } clk_data = kzalloc(sizeof(*clk_data), GFP_KERNEL); - if (!clk_data) + if (!clk_data) { + iounmap(reg_base); return; + } clk_data->num = of_property_count_strings(np, "clock-names"); clk_data->name = kcalloc(clk_data->num, sizeof(char *), GFP_KERNEL); if (!clk_data->name) { + iounmap(reg_base); kfree(clk_data); return; }