[PATCH 6/7] patches: do not use EPROBE_DEFER in media

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This was added in commit 4f528afc.

Signed-off-by: Hauke Mehrtens <hauke@xxxxxxxxxx>
---
 .../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@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Index of Archives]     [Linux ARM Kernel]     [Linux ARM]     [Linux Omap]     [Fedora ARM]     [IETF Annouce]     [Security]     [Bugtraq]     [Linux]     [Linux OMAP]     [Linux MIPS]     [ECOS]     [Asterisk Internet PBX]     [Linux API]

  Powered by Linux