From patchwork Fri May 10 21:55:00 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gianluca Gennari X-Patchwork-Id: 18375 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1UavI2-0007U4-M4; Fri, 10 May 2013 23:55:46 +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.72/mailfrontend-5) with esmtp id 1UavHz-0002Zm-8G; Fri, 10 May 2013 23:55:45 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756048Ab3EJVze (ORCPT + 1 other); Fri, 10 May 2013 17:55:34 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:44193 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753648Ab3EJVzd (ORCPT ); Fri, 10 May 2013 17:55:33 -0400 Received: by mail-ee0-f41.google.com with SMTP id d4so1438680eek.0 for ; Fri, 10 May 2013 14:55:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=9Dv8EM8l6uirFditUYEjF63MjU9drm16ltye/OO0B/A=; b=W4WVc9GTz0FK3axUDafZzHwS9RLmhxyKO2WRzOpZiGA198UMd1psfv+tAaV/d8DP2y I1jXpqaOK9ZpRsSEk34hU6drvWGHW9EhCqYsCX0WT55AkivKSlKQPHmwfz8mq4lfifwK 8t7izluphLc64rJSWxtQkTHBtLidzg6YP2AsU2d3p41SolUO/w8XJll/tqkYxiOvxPVQ PsWOA/XFJ7giJ9Qm2wL8HBDHHP66cZQEoqRneOo3HnK/JEMBIObSA3Vlp2l54igDS67Q 44z3CBykv9QJ2ekEqVbfoL7NP44NqkZaxJgNkIicNyPNgkdeNU9p8zPpfdxI7DyCluy0 pCyw== X-Received: by 10.14.194.70 with SMTP id l46mr45747842een.28.1368222932256; Fri, 10 May 2013 14:55:32 -0700 (PDT) Received: from localhost.localdomain (93-50-34-119.ip150.fastwebnet.it. [93.50.34.119]) by mx.google.com with ESMTPSA id bp51sm6151281eeb.5.2013.05.10.14.55.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 10 May 2013 14:55:31 -0700 (PDT) From: Gianluca Gennari To: linux-media@vger.kernel.org, mchehab@redhat.com, hans.verkuil@cisco.com Cc: Gianluca Gennari Subject: [PATCH] media_build: fix uvcvideo compilation for kernels 2.6.33 and 2.6.34 Date: Fri, 10 May 2013 23:55:00 +0200 Message-Id: <1368222900-8591-1-git-send-email-gennarone@gmail.com> X-Mailer: git-send-email 1.8.2.2 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.5.10.214519 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_GMAIL 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_2000_2999 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, URI_ENDS_IN_HTML 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' Patch v2.6.32_usb_ss_ep_comp.patch is needed also by kernels 2.6.33 and 2.6.34. Signed-off-by: Gianluca Gennari --- backports/backports.txt | 2 +- backports/v2.6.32_usb_ss_ep_comp.patch | 11 ----------- backports/v2.6.34_usb_ss_ep_comp.patch | 11 +++++++++++ 3 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 backports/v2.6.32_usb_ss_ep_comp.patch create mode 100644 backports/v2.6.34_usb_ss_ep_comp.patch diff --git a/backports/backports.txt b/backports/backports.txt index f21cd53..4aaa4d4 100644 --- a/backports/backports.txt +++ b/backports/backports.txt @@ -56,6 +56,7 @@ add v2.6.35_kfifo.patch [2.6.34] add v2.6.34_dvb_net.patch add v2.6.34_fix_define_warnings.patch +add v2.6.34_usb_ss_ep_comp.patch [2.6.33] add v2.6.33_input_handlers_are_int.patch @@ -65,7 +66,6 @@ add v2.6.33_no_gpio_request_one.patch [2.6.32] add v2.6.32_kfifo.patch add v2.6.32_request_firmware_nowait.patch -add v2.6.32_usb_ss_ep_comp.patch [2.6.31] add v2.6.31_nodename.patch diff --git a/backports/v2.6.32_usb_ss_ep_comp.patch b/backports/v2.6.32_usb_ss_ep_comp.patch deleted file mode 100644 index d3624f3..0000000 --- a/backports/v2.6.32_usb_ss_ep_comp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- linux.orig/drivers/media/usb/uvc/uvc_video.c 2012-11-14 14:33:51.995088200 -0500 -+++ linux/drivers/media/usb/uvc/uvc_video.c 2012-11-14 14:36:23.510088227 -0500 -@@ -1447,7 +1447,7 @@ - - switch (dev->speed) { - case USB_SPEED_SUPER: -- return ep->ss_ep_comp.wBytesPerInterval; -+ return ep->ss_ep_comp->desc.wBytesPerInterval; - case USB_SPEED_HIGH: - psize = usb_endpoint_maxp(&ep->desc); - return (psize & 0x07ff) * (1 + ((psize >> 11) & 3)); diff --git a/backports/v2.6.34_usb_ss_ep_comp.patch b/backports/v2.6.34_usb_ss_ep_comp.patch new file mode 100644 index 0000000..d3624f3 --- /dev/null +++ b/backports/v2.6.34_usb_ss_ep_comp.patch @@ -0,0 +1,11 @@ +--- linux.orig/drivers/media/usb/uvc/uvc_video.c 2012-11-14 14:33:51.995088200 -0500 ++++ linux/drivers/media/usb/uvc/uvc_video.c 2012-11-14 14:36:23.510088227 -0500 +@@ -1447,7 +1447,7 @@ + + switch (dev->speed) { + case USB_SPEED_SUPER: +- return ep->ss_ep_comp.wBytesPerInterval; ++ return ep->ss_ep_comp->desc.wBytesPerInterval; + case USB_SPEED_HIGH: + psize = usb_endpoint_maxp(&ep->desc); + return (psize & 0x07ff) * (1 + ((psize >> 11) & 3));