diff options
| author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-26 00:19:25 +0200 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-04-26 22:53:10 +0200 |
| commit | da63fce9197d6383df0a8372fc4da5c9a4fccd17 (patch) | |
| tree | a741de5a12a8930f6d51815cfc1932c29dd9f701 | |
| parent | 65e13415c20763134f80870911e87268a12b4107 (diff) | |
patches: do not use EPROBE_DEFER in media
This was added in commit 4f528afc.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
| -rw-r--r-- | patches/collateral-evolutions/media/0006-no-eprobe_defer/v4l2-clk.patch | 13 |
1 files changed, 13 insertions, 0 deletions
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 00000000..592f5e1c --- /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); |