diff options
author | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
---|---|---|
committer | Luka Perkov <luka@openwrt.org> | 2013-10-03 02:50:00 +0000 |
commit | 38936426f7d4d569f918cb2ca646263b4c38e25b (patch) | |
tree | 66668ff6f447e0a95ee40e3cb8cbe3e211af3874 /target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch | |
parent | 97b15fc45be3d44b1d7700e92433703a139fb97c (diff) | |
download | upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.gz upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.tar.bz2 upstream-38936426f7d4d569f918cb2ca646263b4c38e25b.zip |
kirkwood: update patches and configuration (3.10)
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 38295
Diffstat (limited to 'target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch')
-rw-r--r-- | target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch b/target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch new file mode 100644 index 0000000000..32035ede05 --- /dev/null +++ b/target/linux/kirkwood/patches-3.10/0008-pci-mvebu-fix-return-value-check-in-mvebu_pcie_probe.patch @@ -0,0 +1,28 @@ +From 3ad3d38d36c51b45668708a42f67b07fc87a53e3 Mon Sep 17 00:00:00 2001 +From: Wei Yongjun <yongjun_wei@trendmicro.com.cn> +Date: Mon, 27 May 2013 11:38:41 +0800 +Subject: [PATCH 08/29] pci: mvebu: fix return value check in + mvebu_pcie_probe() + +In case of error, function of_clk_get_by_name() returns +ERR_PTR() never returns NULL. The NULL test in the return +value check should be replaced with IS_ERR(). + +Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> +Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Jason Cooper <jason@lakedaemon.net> +--- + drivers/pci/host/pci-mvebu.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/pci/host/pci-mvebu.c ++++ b/drivers/pci/host/pci-mvebu.c +@@ -828,7 +828,7 @@ static int __init mvebu_pcie_probe(struc + } + + port->clk = of_clk_get_by_name(child, NULL); +- if (!port->clk) { ++ if (IS_ERR(port->clk)) { + dev_err(&pdev->dev, "PCIe%d.%d: cannot get clock\n", + port->port, port->lane); + iounmap(port->base); |