[GIT,PULL,FOR,v3.6] VIDIOC_OVERLAY regression fix
Message ID | 201209041515.17033.hansverk@cisco.com (mailing list archive) |
---|---|
State | Accepted, archived |
Headers |
Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from <linux-media-owner@vger.kernel.org>) id 1T8t7s-0001XA-Mv for patchwork@linuxtv.org; Tue, 04 Sep 2012 15:25:09 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-4) with esmtp for <patchwork@linuxtv.org> id 1T8t7s-0007Jd-9r; Tue, 04 Sep 2012 15:25:08 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757085Ab2IDNZF (ORCPT <rfc822;patchwork@linuxtv.org>); Tue, 4 Sep 2012 09:25:05 -0400 Received: from ams-iport-1.cisco.com ([144.254.224.140]:2136 "EHLO ams-iport-1.cisco.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757065Ab2IDNZE (ORCPT <rfc822; linux-media@vger.kernel.org>); Tue, 4 Sep 2012 09:25:04 -0400 X-Greylist: delayed 585 seconds by postgrey-1.27 at vger.kernel.org; Tue, 04 Sep 2012 09:25:03 EDT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=cisco.com; i=hansverk@cisco.com; l=1198; q=dns/txt; s=iport; t=1346765103; x=1347974703; h=from:to:subject:date:mime-version: content-transfer-encoding:message-id; bh=YysXj86vRInl4Uf7vRq2osfk1HOvSzAvfxMfO0ffNaM=; b=jdSuqS6bCKxJNlZUC/wGlGoqss4jsg6fep4GfDzsjxSIguodqPfpFD9t KnN0ZjG1B6hLZqdf+sga2Id/gw81wHCmJ7S6Pjv8g+bkr2rMjx2M/5BPJ MC0mMaZKivXRWbZ8UJFijZUyrJ77upgdaqfYmSFs+GlfQn8dNnPYHaVY5 U=; X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvwEACn+RVCQ/khN/2dsb2JhbABFuyqBB4I5ASeBfTWHa5klgSifcosWhykDlVmBFIgfhQCBZ4JlgVY X-IronPort-AV: E=Sophos;i="4.80,367,1344211200"; d="scan'208";a="143298108" Received: from ams-core-4.cisco.com ([144.254.72.77]) by ams-iport-1.cisco.com with ESMTP; 04 Sep 2012 13:15:17 +0000 Received: from cobaltpc1.localnet (dhcp-10-54-92-107.cisco.com [10.54.92.107]) by ams-core-4.cisco.com (8.14.5/8.14.5) with ESMTP id q84DFHMe013161 for <linux-media@vger.kernel.org>; Tue, 4 Sep 2012 13:15:17 GMT From: Hans Verkuil <hansverk@cisco.com> Organization: Cisco Systems Norway To: "linux-media" <linux-media@vger.kernel.org> Subject: [GIT PULL FOR v3.6] VIDIOC_OVERLAY regression fix Date: Tue, 4 Sep 2012 15:15:17 +0200 User-Agent: KMail/1.13.7 (Linux/3.5-0.slh.1-aptosid-amd64; KDE/4.8.4; x86_64; ; ) MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Message-Id: <201209041515.17033.hansverk@cisco.com> Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: <linux-media.vger.kernel.org> X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2012.9.4.131525 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1300_1399 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_MEDIA_BODY 0, __CP_URI_IN_BODY 0, __CT 0, __CTE 0, __CT_TEXT_PLAIN 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' |
Pull-request
git://linuxtv.org/hverkuil/media_tree.git overlayMessage
Hans Verkuil (hansverk)
Sept. 4, 2012, 1:15 p.m. UTC
Hi Mauro, While working on something else I suddenly saw that the VIDIOC_OVERLAY support was broken in 3.6. The vidioc_overlay op in v4l2-ioctls.h receives an unsigned int, whereas the ioctl table in v4l2-ioctls.c assumed that it would be an unsigned int pointer. To fix this a small conversion function was made. This patch applies to 3.7. By checking 'v4l2-core' to 'video' in the path of the file this patch will also apply to 3.6. All other ioctls that do this dereferencing are fine, it's just this one that's failing. Regards, Hans The following changes since commit 79e8c7bebb467bbc3f2514d75bba669a3f354324: Merge tag 'v3.6-rc3' into staging/for_v3.7 (2012-08-24 11:25:10 -0300) are available in the git repository at: git://linuxtv.org/hverkuil/media_tree.git overlay for you to fetch changes up to 22ffede236c77ad0d4bff19a9cffe4f27bd05819: v4l2-ioctl.c: fix overlay support. (2012-09-04 15:08:01 +0200) ---------------------------------------------------------------- Hans Verkuil (1): v4l2-ioctl.c: fix overlay support. drivers/media/v4l2-core/v4l2-ioctl.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html