[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-backports
Subject:    [PATCH 6/7] patches: do not use EPROBE_DEFER in media
From:       Hauke Mehrtens <hauke () hauke-m ! de>
Date:       2015-04-26 21:04:23
Message-ID: 1430082264-11808-7-git-send-email-hauke () hauke-m ! de
[Download RAW message or body]

This was added in commit 4f528afc.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 .../media/0006-no-eprobe_defer/v4l2-clk.patch               | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 patches/collateral-evolutions/media/0006-no-eprobe_defer/v4l2-clk.patch


diff --git a/patches/collateral-evolutions/media/0006-no-eprobe_defer/v4l2-clk.patch \
b/patches/collateral-evolutions/media/0006-no-eprobe_defer/v4l2-clk.patch new file \
mode 100644 index 0000000..592f5e1
--- /dev/null
+++ b/patches/collateral-evolutions/media/0006-no-eprobe_defer/v4l2-clk.patch
@@ -0,0 +1,13 @@
+--- a/drivers/media/v4l2-core/v4l2-clk.c
++++ b/drivers/media/v4l2-core/v4l2-clk.c
+@@ -40,8 +40,10 @@ struct v4l2_clk *v4l2_clk_get(struct dev
+ 	struct v4l2_clk *clk;
+ 	struct clk *ccf_clk = clk_get(dev, id);
+ 
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,4,0)
+ 	if (PTR_ERR(ccf_clk) == -EPROBE_DEFER)
+ 		return ERR_PTR(-EPROBE_DEFER);
++#endif
+ 
+ 	if (!IS_ERR_OR_NULL(ccf_clk)) {
+ 		clk = kzalloc(sizeof(*clk), GFP_KERNEL);
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe backports" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


[prev in list] [next in list] [prev in thread] [next in thread]