Current media_build doesn't succeed building on kernel 3.1.10

Commit Message

Michael West Oct. 2, 2012, 10:42 a.m. UTC

Was looking to make a better fix than trying to just remove that line while the Make was busy running so I made a quick simple backports patch.
This patch can be applied to the media_build git and it will remove the devm_regulator_bulk_get function call that is not supported in pre 3.4 kernels from s5k4ecgx.c.  I'm sure there are better ways to fix this build problem but this seems to work for now anyway.
---
 backports/backports.txt       |    3 +++
 backports/v3.3_s5k4ecgx.patch |   12 ++++++++++++
 2 files changed, 15 insertions(+)
 create mode 100644 backports/v3.3_s5k4ecgx.patch

Comments

Hans Verkuil Oct. 2, 2012, 10:49 a.m. UTC | #1

On Tue 2 October 2012 12:42:10 Michael West wrote:
> Was looking to make a better fix than trying to just remove that line while the Make was busy running so I made a quick simple backports patch.
> This patch can be applied to the media_build git and it will remove the devm_regulator_bulk_get function call that is not supported in pre 3.4 kernels from s5k4ecgx.c.  I'm sure there are better ways to fix this build problem but this seems to work for now anyway.

I've edited v4l/versions.txt to prevent this driver from being built on kernels
< 3.4. That should do the trick.

That change is now committed to media_build.

Regards,

	Hans

> ---
>  backports/backports.txt       |    3 +++
>  backports/v3.3_s5k4ecgx.patch |   12 ++++++++++++
>  2 files changed, 15 insertions(+)
>  create mode 100644 backports/v3.3_s5k4ecgx.patch
> 
> diff --git a/backports/backports.txt b/backports/backports.txt
> index 5554d9e..274945d 100644
> --- a/backports/backports.txt
> +++ b/backports/backports.txt
> @@ -24,6 +24,9 @@
>  add api_version.patch
>  add pr_fmt.patch
>  
> +[3.3.255]
> +add v3.3_s5k4ecgx.patch
> +
>  [3.1.255]
>  add v3.1_no_export_h.patch
>  add v3.1_no_pm_qos.patch
> diff --git a/backports/v3.3_s5k4ecgx.patch b/backports/v3.3_s5k4ecgx.patch
> new file mode 100644
> index 0000000..0e44163
> --- /dev/null
> +++ b/backports/v3.3_s5k4ecgx.patch
> @@ -0,0 +1,12 @@
> +diff -r drivers/media/i2c/s5k4ecgx.c
> +--- a/drivers/media/i2c/s5k4ecgx.c	2012-10-02 15:32:07.309032679 +1300
> ++++ b/drivers/media/i2c/s5k4ecgx.c	2012-10-02 15:31:22.052994719 +1300
> +@@ -974,8 +974,6 @@
> + 	for (i = 0; i < S5K4ECGX_NUM_SUPPLIES; i++)
> + 		priv->supplies[i].supply = s5k4ecgx_supply_names[i];
> + 
> +-	ret = devm_regulator_bulk_get(&client->dev, S5K4ECGX_NUM_SUPPLIES,
> +-				 priv->supplies);
> + 	if (ret) {
> + 		dev_err(&client->dev, "Failed to get regulators\n");
> + 		goto out_err2;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/backports/backports.txt b/backports/backports.txt
index 5554d9e..274945d 100644
--- a/backports/backports.txt
+++ b/backports/backports.txt
@@ -24,6 +24,9 @@ 
 add api_version.patch
 add pr_fmt.patch
 
+[3.3.255]
+add v3.3_s5k4ecgx.patch
+
 [3.1.255]
 add v3.1_no_export_h.patch
 add v3.1_no_pm_qos.patch
diff --git a/backports/v3.3_s5k4ecgx.patch b/backports/v3.3_s5k4ecgx.patch
new file mode 100644
index 0000000..0e44163
--- /dev/null
+++ b/backports/v3.3_s5k4ecgx.patch
@@ -0,0 +1,12 @@ 
+diff -r drivers/media/i2c/s5k4ecgx.c
+--- a/drivers/media/i2c/s5k4ecgx.c	2012-10-02 15:32:07.309032679 +1300
++++ b/drivers/media/i2c/s5k4ecgx.c	2012-10-02 15:31:22.052994719 +1300
+@@ -974,8 +974,6 @@
+ 	for (i = 0; i < S5K4ECGX_NUM_SUPPLIES; i++)
+ 		priv->supplies[i].supply = s5k4ecgx_supply_names[i];
+ 
+-	ret = devm_regulator_bulk_get(&client->dev, S5K4ECGX_NUM_SUPPLIES,
+-				 priv->supplies);
+ 	if (ret) {
+ 		dev_err(&client->dev, "Failed to get regulators\n");
+ 		goto out_err2;