diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-02-11 02:07:41 +0000 |
| commit | 3af779eb172b0438f77e8a01a97dd0eb9a146076 (patch) | |
| tree | 23838dbde109e79f4c4763dbf78a983aeeefafe1 /target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch | |
| parent | 69d323f23119ce6986c2803f34d95869144a00e6 (diff) | |
| download | mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.zip mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.gz mtk-20170518-3af779eb172b0438f77e8a01a97dd0eb9a146076.tar.bz2 | |
mvebu: backport mainline patches from kernel 3.12
This is a backport of the patches accepted to the Linux mainline related to
mvebu SoC (Armada XP and Armada 370) between Linux v3.11, and Linux v3.12.
This work mainly covers:
* Ground work for sharing the pxa nand driver(drivers/mtd/nand/pxa3xx_nand.c)
between the PXA family,and the Armada family.
* Further updates to the mvebu MBus.
* Work and ground work for enabling MSI on the Armada family.
* some phy / mdio bus initialization related work.
* Device tree binding documentation update.
Signed-off-by: Seif Mazareeb <seif.mazareeb@gmail.com>
CC: Luka Perkov <luka@openwrt.org>
SVN-Revision: 39565
Diffstat (limited to 'target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch')
| -rw-r--r-- | target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch b/target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch new file mode 100644 index 0000000..f075d6e --- /dev/null +++ b/target/linux/mvebu/patches-3.10/0105-mtd-nand-pxa3xx-Check-for-clk_prepare_enable-return-.patch @@ -0,0 +1,29 @@ +From 7e8fbc673938278ec7165b99b76227d7cc2ab012 Mon Sep 17 00:00:00 2001 +From: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Date: Wed, 17 Apr 2013 13:38:13 -0300 +Subject: [PATCH 105/203] mtd: nand: pxa3xx: Check for clk_prepare_enable() + return value + +clk_prepare_enable() can fail due to unknown reason. +Add a check for this and return the error code if it fails. + +Signed-off-by: Ezequiel Garcia <ezequiel.garcia@free-electrons.com> +Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com> +Signed-off-by: David Woodhouse <David.Woodhouse@intel.com> +--- + drivers/mtd/nand/pxa3xx_nand.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +--- a/drivers/mtd/nand/pxa3xx_nand.c ++++ b/drivers/mtd/nand/pxa3xx_nand.c +@@ -1072,7 +1072,9 @@ static int alloc_nand_resource(struct pl + dev_err(&pdev->dev, "failed to get nand clock\n"); + return PTR_ERR(info->clk); + } +- clk_prepare_enable(info->clk); ++ ret = clk_prepare_enable(info->clk); ++ if (ret < 0) ++ return ret; + + /* + * This is a dirty hack to make this driver work from devicetree |