From: Rafael van Horn <rafael.vanhorn@gmail.com>
To: linux-media@vger.kernel.org
Subject: media_build wrong patch
Date: Fri, 18 Jul 2014 01:46:52 +0200 [thread overview]
Message-ID: <53C8606C.4000907@gmail.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1747 bytes --]
Hi,
I'd like to file a bug in the latest commit:
b6f4c524e0fe8f2d50b0a2f849e022adef76c6cc
The file backports/api_version.patch rejects to patch the
linux/drivers/media/v4l2-core/v4l2-ioctl.c because of wrong line numbers
and because the code doesn't match.
This is your code:
-----------------------------------------------------------------------
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1009,7 +1009,7 @@ static int v4l_querycap(const struct
v4l2_ioctl_ops *ops,
struct v4l2_capability *cap = (struct v4l2_capability *)arg;
int ret;
- cap->version = LINUX_VERSION_CODE;
+ cap->version = V4L2_VERSION;
ret = ops->vidioc_querycap(file, fh, cap);
-----------------------------------------------------------------------
This should be there:
-----------------------------------------------------------------------
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -964,7 +964,7 @@ static int v4l_querycap(const struct v4l2_ioctl_ops
*ops,
{
struct v4l2_capability *cap = (struct v4l2_capability *)arg;
- cap->version = LINUX_VERSION_CODE;
+ cap->version = V4L2_VERSION;
return ops->vidioc_querycap(file, fh, cap);
}
-----------------------------------------------------------------------
In the C file there's no ret variable and all the code is moved
somewhere else, but it's not @@ line 1009.
The diff file is attached.
When I hacked the patch file, I built everything.
Regards.
Rafael van Horn
-----------------------------------------------------------------------
Debian 7.6
gcc Version: 4:4.7.2-1
make Version: 3.81-8.2
perl Version: 5.14.2-21+deb7u1
linux-headers-amd64 Version: 3.2+46
patch Version: 2.6.1-3
[-- Attachment #2: api_version.patch.diff --]
[-- Type: text/x-patch, Size: 684 bytes --]
--- MB/backports/api_version.patch 2014-07-18 00:48:54.773248546 +0200
+++ api_version.patch 2014-07-18 01:36:33.878313555 +0200
@@ -41,12 +41,12 @@
index e0bafda..6225391 100644
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
-@@ -1009,7 +1009,7 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
+@@ -964,7 +964,7 @@ static int v4l_querycap(const struct v4l2_ioctl_ops *ops,
+ {
struct v4l2_capability *cap = (struct v4l2_capability *)arg;
- int ret;
- cap->version = LINUX_VERSION_CODE;
+ cap->version = V4L2_VERSION;
-
- ret = ops->vidioc_querycap(file, fh, cap);
+ return ops->vidioc_querycap(file, fh, cap);
+ }
next reply other threads:[~2014-07-17 23:46 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-17 23:46 Rafael van Horn [this message]
2014-07-18 0:03 ` media_build wrong patch Hans Verkuil
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53C8606C.4000907@gmail.com \
--to=rafael.vanhorn@gmail.com \
--cc=linux-media@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).