Merge branch 'drm-sti-next-2015-11-03' of http://git.linaro.org/people/benjamin.gaign...

[firefly-linux-kernel-4.4.55.git] / drivers / clk / at91 / clk-system.c

diff --git a/drivers/clk/at91/clk-system.c b/drivers/clk/at91/clk-system.c
index 58008b3e8bc175f8befb8126e99e5f55c57d2176..3f5314344286e3335ec77f9c02360cb75c19cb93 100644 (file)
--- a/drivers/clk/at91/clk-system.c
+++ b/drivers/clk/at91/clk-system.c
@@ -138,7 +138,8 @@ at91_clk_register_system(struct at91_pmc *pmc, const char *name,
 
        clk = clk_register(NULL, &sys->hw);
        if (IS_ERR(clk)) {
-               free_irq(sys->irq, sys);
+               if (irq)
+                       free_irq(sys->irq, sys);
                kfree(sys);
        }