From: Greg Kroah-Hartman Date: Wed, 11 Oct 2006 23:06:15 +0000 (-0700) Subject: 2 more 2.6.18.1 patches added X-Git-Tag: v2.6.17.14~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6527d339376ea9d4b8d82a0f0f726952e1747c58;p=thirdparty%2Fkernel%2Fstable-queue.git 2 more 2.6.18.1 patches added --- diff --git a/review-2.6.18/add-utsrelease.h-to-the-dontdiff-file.patch b/review-2.6.18/add-utsrelease.h-to-the-dontdiff-file.patch new file mode 100644 index 00000000000..92c5d4d346a --- /dev/null +++ b/review-2.6.18/add-utsrelease.h-to-the-dontdiff-file.patch @@ -0,0 +1,26 @@ +From stable-bounces@linux.kernel.org Wed Oct 11 16:04:54 2006 +Date: Wed, 11 Oct 2006 18:19:24 -0400 +From: Dave Jones +To: Greg KH +Message-ID: <20061011221924.GB2248@redhat.com> +Subject: add utsrelease.h to the dontdiff file + +From: Dave Jones + +Signed-off-by: Dave Jones +Signed-off-by: Greg Kroah-Hartman + +--- + Documentation/dontdiff | 1 + + 1 file changed, 1 insertion(+) + +--- linux-2.6.18.orig/Documentation/dontdiff ++++ linux-2.6.18/Documentation/dontdiff +@@ -135,6 +135,7 @@ tags + times.h* + tkparse + trix_boot.h ++utsrelease.h* + version.h* + vmlinux + vmlinux-* diff --git a/review-2.6.18/series b/review-2.6.18/series index 011f2b036af..4b2a3b5d055 100644 --- a/review-2.6.18/series +++ b/review-2.6.18/series @@ -65,3 +65,5 @@ x86-64-calgary-iommu-fix-off-by-one-when-calculating-register-space-location.pat bcm43xx-fix-regressions-in-2.6.18.patch netfilter-nat-fix-notrack-checksum-handling.patch block-layer-elv_iosched_show-should-get-elv_list_lock.patch +v4l-copy-paste-bug-in-videodev.c.patch +add-utsrelease.h-to-the-dontdiff-file.patch diff --git a/review-2.6.18/v4l-copy-paste-bug-in-videodev.c.patch b/review-2.6.18/v4l-copy-paste-bug-in-videodev.c.patch new file mode 100644 index 00000000000..47c79aee324 --- /dev/null +++ b/review-2.6.18/v4l-copy-paste-bug-in-videodev.c.patch @@ -0,0 +1,36 @@ +From stable-bounces@linux.kernel.org Wed Oct 11 16:02:45 2006 +From: Sascha Hauer +To: Greg KH +Subject: V4L: copy-paste bug in videodev.c + +This patch fixes a copy-paste bug in videodev.c where the vidioc_qbuf() +function gets called for the dqbuf ioctl. + +Signed-off-by: Sascha Hauer +Cc: Jonathan Corbet +Signed-off-by: Michael Krufky +Signed-off-by: Mauro Carvalho Chehab +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/media/video/videodev.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- linux-2.6.18.orig/drivers/media/video/videodev.c ++++ linux-2.6.18/drivers/media/video/videodev.c +@@ -739,13 +739,13 @@ static int __video_do_ioctl(struct inode + case VIDIOC_DQBUF: + { + struct v4l2_buffer *p=arg; +- if (!vfd->vidioc_qbuf) ++ if (!vfd->vidioc_dqbuf) + break; + ret = check_fmt (vfd, p->type); + if (ret) + break; + +- ret=vfd->vidioc_qbuf(file, fh, p); ++ ret=vfd->vidioc_dqbuf(file, fh, p); + if (!ret) + dbgbuf(cmd,vfd,p); + break;