]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
uio: pruss: add clk_disable()
authorAlexey Khoroshilov <khoroshilov@ispras.ru>
Fri, 25 Nov 2016 21:55:30 +0000 (00:55 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Nov 2016 19:43:12 +0000 (20:43 +0100)
pruss_probe() enables gdev->pruss_clk, but there is no clk_disable()
in the driver.

The patch adds clk_disable() to pruss_cleanup() and error handling for
clk_enable().

Found by Linux Driver Verification project (linuxtesting.org).

Signed-off-by: Alexey Khoroshilov <khoroshilov@ispras.ru>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/uio/uio_pruss.c

index ca9e2fafb0b6c05571b2652e5dcb45b12257b7a9..31d5b1d3b5af69a7344653f83c4b07cc99293f12 100644 (file)
@@ -111,6 +111,7 @@ static void pruss_cleanup(struct device *dev, struct uio_pruss_dev *gdev)
                              gdev->sram_vaddr,
                              sram_pool_sz);
        kfree(gdev->info);
+       clk_disable(gdev->pruss_clk);
        clk_put(gdev->pruss_clk);
        kfree(gdev);
 }
@@ -143,7 +144,14 @@ static int pruss_probe(struct platform_device *pdev)
                kfree(gdev);
                return ret;
        } else {
-               clk_enable(gdev->pruss_clk);
+               ret = clk_enable(gdev->pruss_clk);
+               if (ret) {
+                       dev_err(dev, "Failed to enable clock\n");
+                       clk_put(gdev->pruss_clk);
+                       kfree(gdev->info);
+                       kfree(gdev);
+                       return ret;
+               }
        }
 
        regs_prussio = platform_get_resource(pdev, IORESOURCE_MEM, 0);