Patch "pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers" has been added to the 4.2-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers
to the 4.2-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
pcmcia-sa11x0-fix-missing-clk_put-in-sa11x0-socket-drivers.patch
and it can be found in the queue-4.2 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
72010aca55264cfe6516a955066c846d3885b0c6Mon Sep 17 00:00:00 2001
From: Russell King <[email protected]>
Date: Thu, 26 Mar 2015 10:22:20 +0000
Subject: pcmcia: sa11x0: fix missing clk_put() in sa11x0 socket drivers
From: Russell King <[email protected]>
commit 72010aca55264cfe6516a955066c846d3885b0c6 upstream.
Fix the lack of clk_put() in sa11xx_base.c's error cleanup paths by converting the driver to the devm_* API.
--- drivers/pcmcia/sa1100_generic.c | 1 - drivers/pcmcia/sa11xx_base.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-)
drivers/pcmcia/sa1100_generic.c +0 -1
@@ -93,7 +93,6 @@ static int sa11x0_drv_pcmcia_remove(strufor (i =0 ; i < sinfo->nskt; i++)soc_pcmcia_remove_one (&sinfo->skt[i]); -clk_put (sinfo->clk);kfree (sinfo);return 0 ; }
drivers/pcmcia/sa11xx_base.c +1 -2
@@ -222,7 +222,7 @@ int sa11xx_drv_pcmcia_probe(struct devicint i, ret =0 ;struct clk *clk; - clk =clk_get (dev,NULL ); + clk =devm_clk_get (dev,NULL );if (IS_ERR (clk))return PTR_ERR (clk);
@@ -251,7 +251,6 @@ int sa11xx_drv_pcmcia_probe(struct devicif (ret) {while (--i >=0 )soc_pcmcia_remove_one (&sinfo->skt[i]); -clk_put (clk);kfree (sinfo); }else {dev_set_drvdata (dev, sinfo);
Patches currently in stable-queue which might be from [email protected] are
queue-4.2/pcmcia-sa11x0-fix-missing-clk_put-in-sa11x0-socket-drivers.patch queue-4.2/arm-8401-1-perf-set-affinity-for-ppi-based-pmus.patch queue-4.2/arm-8425-1-kgdb-don-t-try-to-stop-the-machine-when-setting-breakpoints.patch queue-4.2/arm-fix-thumb2-signal-handling-when-armv6-is-enabled.patch queue-4.2/arm-8429-1-disable-gcc-sra-optimization.patch