From patchwork Tue Apr 11 06:12:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Manish Narani X-Patchwork-Id: 97221 Delivered-To: patch@linaro.org Received: by 10.140.89.233 with SMTP id v96csp1665569qgd; Mon, 10 Apr 2017 23:12:38 -0700 (PDT) X-Received: by 10.98.75.25 with SMTP id y25mr20739890pfa.157.1491891158677; Mon, 10 Apr 2017 23:12:38 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 80si15828732pfp.99.2017.04.10.23.12.38; Mon, 10 Apr 2017 23:12:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@xilinx.onmicrosoft.com; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753240AbdDKGMi (ORCPT + 5 others); Tue, 11 Apr 2017 02:12:38 -0400 Received: from mail-dm3nam03on0060.outbound.protection.outlook.com ([104.47.41.60]:11712 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752463AbdDKGMg (ORCPT ); Tue, 11 Apr 2017 02:12:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=xilinx.onmicrosoft.com; s=selector1-xilinx-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=uF9wdGcV4ffZznz4nug7T67LXl9jEJJYXbLwmNCK8OY=; b=2iwiZGKpOuflKu1DAHqbTKKlspr1ywhNk7FBYJyVfey+Gf8ShlN188yZkFQFg/1fMalCiRPdUwFXEKxh2zF8qwOnBNUjzcLbBGgMf/FaMKBcGw5gt31klu6VV+G4oSx1rfIS45TTRqgxQuiPx0hEvNzBh2hESmbysLxmjvgoNBU= Received: from BN6PR02CA0055.namprd02.prod.outlook.com (10.175.94.145) by MWHPR02MB2590.namprd02.prod.outlook.com (10.168.205.144) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17; Tue, 11 Apr 2017 06:12:33 +0000 Received: from SN1NAM02FT025.eop-nam02.prod.protection.outlook.com (2a01:111:f400:7e44::205) by BN6PR02CA0055.outlook.office365.com (2603:10b6:404:f9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1019.17 via Frontend Transport; Tue, 11 Apr 2017 06:12:33 +0000 Authentication-Results: spf=pass (sender IP is 149.199.60.83) smtp.mailfrom=xilinx.com; vger.kernel.org; dkim=none (message not signed) header.d=none;vger.kernel.org; dmarc=bestguesspass action=none header.from=xilinx.com; Received-SPF: Pass (protection.outlook.com: domain of xilinx.com designates 149.199.60.83 as permitted sender) receiver=protection.outlook.com; client-ip=149.199.60.83; helo=xsj-pvapsmtpgw01; Received: from xsj-pvapsmtpgw01 (149.199.60.83) by SN1NAM02FT025.mail.protection.outlook.com (10.152.72.87) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Tue, 11 Apr 2017 06:12:32 +0000 Received: from unknown-38-66.xilinx.com ([149.199.38.66] helo=xsj-pvapsmtp01) by xsj-pvapsmtpgw01 with esmtp (Exim 4.63) (envelope-from ) id 1cxp2N-0001YM-07; Mon, 10 Apr 2017 23:12:23 -0700 Received: from [127.0.0.1] (helo=localhost) by xsj-pvapsmtp01 with smtp (Exim 4.63) (envelope-from ) id 1cxp2M-0007bz-Ss; Mon, 10 Apr 2017 23:12:22 -0700 Received: from xsj-pvapsmtp01 (mailhub.xilinx.com [149.199.38.66]) by xsj-smtp-dlp1.xlnx.xilinx.com (8.13.8/8.13.1) with ESMTP id v3B6CG7V019087; Mon, 10 Apr 2017 23:12:17 -0700 Received: from [172.23.64.139] (helo=xhd-lin64re116.xilinx.com) by xsj-pvapsmtp01 with esmtp (Exim 4.63) (envelope-from ) id 1cxp2G-0007bQ-LG; Mon, 10 Apr 2017 23:12:16 -0700 Received: by xhd-lin64re116.xilinx.com (Postfix, from userid 16987) id C50B33036AF; Tue, 11 Apr 2017 11:42:15 +0530 (IST) From: Manish Narani To: CC: , Roger Quadros , , Felipe Balbi Subject: [PATCH] Revert "usb: gadget: uvc: Add missing call for additional setup data" Date: Tue, 11 Apr 2017 11:42:05 +0530 Message-ID: <1491891125-25721-1-git-send-email-mnarani@xilinx.com> X-Mailer: git-send-email 2.1.1 X-RCIS-Action: ALLOW X-TM-AS-Product-Ver: IMSS-7.1.0.1224-8.1.0.1062-22996.005 X-TM-AS-User-Approved-Sender: Yes;Yes X-EOPAttributedMessage: 0 X-MS-Office365-Filtering-HT: Tenant X-Forefront-Antispam-Report: CIP:149.199.60.83; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(39850400002)(39400400002)(39410400002)(39450400003)(39840400002)(39860400002)(2980300002)(438002)(199003)(189002)(9170700003)(8936002)(50226002)(47776003)(50986999)(189998001)(33646002)(54906002)(42186005)(63266004)(305945005)(48376002)(2351001)(8676002)(2906002)(106466001)(81166006)(5003940100001)(50466002)(5660300001)(52956003)(4326008)(36386004)(90966002)(110136004)(38730400002)(6266002)(46386002)(103686004)(6666003)(6862004)(45336002)(356003)(36756003)(6636002)(107986001); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR02MB2590; H:xsj-pvapsmtpgw01; FPR:; SPF:Pass; MLV:sfv; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; SN1NAM02FT025; 1:7SBl7RgiDOHG8pl9aHC3Vwr4by17cHUTSz8AezQtxeOE6W6ZQnVXz7yWU3a3SQhvUjwYAeCw4Fo0/MVs9QHsiR4T3Qx5onc83kuHbtlAVhh9c5qyDQhnhU01KXt0NvUvIpq49xlrSreranTXPhlfgQctD85XyO5dH4YmfBX0JGrmqocYRF5E1qf7jU5MWvY+/KtRIDcv8qJQ5l/L6lILVtB0rlOnFHfpcy4S6AQDZtK16hSrq70El2MpFu2ShCxfcN+X47JGk1QlnvPFPiW+qS7hx6neUrhEwP1mLg1n1gOoFpcyOYF/ToTgmhPpZXCQ/lSv1wythn5+r/G8zvFlrJdS/RVvN9ap7Gr0jXOldIdNUtxxVddSD7ChPCUnu/iXVTR6h4cLJEVG0U7Me5ePSCAj9qVu5Ayhb7HpC16m0KeLoqRe8Ridrz+MXMVZjYGq9m2F0W8FD5RyueIDHbJ4617YcRjn6OZBd+a0qkFGGnHL/BT4ctjQcgPT1AzaKTeZ8X/SQK2J1SMVQbLA4FZq+9qUlfga+x1GmTVFSO1yNfwlmWVLwz2yFwZO98b0rK6pvDqq6e2898A1bz8zX7BxTOndWcxcw8pho3SVhoE0CjinL1q+cOytX0VlplrlLantr6oR9+OBgOcqWnd+/ss5yw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: c74e9151-c51a-4cc1-8dee-08d480a1bdf8 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:MWHPR02MB2590; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 3:HioGMbRwU5GcB7dBeUsT6D5sFmuXHoC38igo0jDXzkDrizrWIarEOM+R9D8XW9tWu22mD4QCquZqt+AgTEYFMOEUKII2KwTH9ruhs5+FitSx0+Q0E5+qtLYAg8ntjuxFxF3RuQAV1+I2liymceRs6FLOxa2LctxgMS4DDvHxDfdgW4/S0usieZFevBq8E0yqvtd42v+KYBkfZpbyKjnveKVxe32cwCzoYJT8q/4J2T2uTi4cV0DGtXNCslu7F1LuOGKrum3DVp7xumQMhZ/0EChBR2tBbtNDMKA1KhcAl+Ik2rVvpXE5Miyoh7V+tznCRGcAs4zzueJaR2zi/AcV7AwSyWHL0AbGWYi0AOEcKJFCJbvgiBeNRGKw6pm0gqJlplW/IABuu5EK/hVJrHrKGQ7o9s0mZU6Sc0WlAnL3hU88uCPtHYKSBn/SSJ15FVvX+te7g4tQ/em4pTZ95KEQXkbofbweYQg5fDduzg0H6EBTKL1vfjNofOhJH+6EJVtz X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 25:/M3TD9SSYGUmhs2bPhMi7rnc/mKDuuUJSQXUOkCSy0qoxQvMkQzLL7uIwZZWQWCYF8Au3BcCoabxV9v7BSSunMq8FyPIXQVl7czau1icRkwbvV8wkWDnLrhsmgm7dAWD0hJND0g4wWkzU7hS5To7V6/QM78YTQyU1IrI+/8DEY9BwB1+79Z0qWWZDTFbcrT6kbUb2rgZmtvTtUTsIZK5inAW0YdzBWKCz9E/nvHJnnm/X83vQsTfYpFppZQYDPqu3iIJQfNlWGPgHNkm48PUHdxd4pTTXWUTdLVByLqJQ+6CTUlyyMAKD5rrxVwf9HQ0Or9HB8KKpb48fYxyf2NseLyv/D0aKZGBMLh6bah6ssXAu2KbDtvdMFRl/DUJne1YsOegcxaAZrOPRcwzoglkm6KWbw2uBOLECpoRfW8Bjhynxt7IeO5+7zXspJ7x0/oEPXl1Kffs/cV5sEdpXz5VGQ==; 31:dVlYBhQkYDsk4o7Bp8dlQ9QQs6Yb60ocJibBquU2nm9aaCHNoJIsSfbVmxCcPrv3l4K3cnHCBCQTDrGrdHZiL2m3ON7nucMWjWmOHzfKdVFSchoLLNay9XltNR/LvYh9Q0sGwKLZAo3ymyx6d/5fGih5CZixXkHn/dzPcCXbA/e5UUtnmahsXuKEiqpsuicXhEdsNNziiW6kMojIQRpLc+T0f8wNVwvoAQGlmLqo3PzrI692vVaS0vCAtCNhK8TCuOsXPx079+GEf9nx+ce4yA== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 20:QcGn1sq1uxDPqnuWNW1ptRDg6iOU5/24RDIbUDO6dpWZiKCbFkwP+1Z0H/8qqE0eEtujjw4y0CI5Fgskjq7CqIAo/IhFD9AzfjA4duggp7d1SKjA/VAeK7XzmTLtoj3+povGo7Q9pQ4fTe+oftvFbHR4MTAhvoyV3HKw8K8fM2uzSJtdq359VfzLaMmFlVfeAaD5H7F53ckNUuueB88K1D72Wwg/nQfFxeQCjbgtSfmRxBBve1bDOY28KlXMfUvin11Z+Gfm6DtsxEir4ix3GBjfPcLYg+HU1ZOoM1NmxjXNiBudPNnhMlAGtXzs8MG/lb2AHjw2Fmg0DVfpz8pkJf5soDOfRyei+FuVxTusLfndTd2xUzFs+I+lCKVjIOjLlm7Ajz559tgNXNBOI1QOJIyiwHEJbDKMC9F6Zewe7g7ofqgN3A+m7hPtKQ4HcWA/VIQinvBZITbZ4NcH+aJgk/nmasu0EgZBftxXrAEyxcea29QXBuslR8kpJLHax/Wh X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(31051911155226)(9452136761055)(228905959029699); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(13015025)(8121501046)(5005006)(13017025)(13024025)(13023025)(13018025)(93006095)(93004095)(10201501046)(3002001)(6055026)(6041248)(20161123564025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123562025)(20161123555025)(6072148); SRVR:MWHPR02MB2590; BCL:0; PCL:0; RULEID:; SRVR:MWHPR02MB2590; X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 4:1Q+s2blzHv4QO6zMlV+dsbB3TMoqTnkjiYxSzS7E95oFAy6hVh0iizMAyP41FXkhXH3umc9YePJgsfl6QavhPgE0oNl87PJLW/D9HPWSkehQJG3PFgRkXHo4eM4KUFIkoetf8DKVo6+P5qpcq2KhPzmnN7WJYxhT/9BzDvxinieot/5yLhN9XbHbOK94Lz8qXi2xloduaTUv+5RFt0bVHVQXzJuNB7zXGdRDeRtsBWlxa1SZqUbFK3gJ5iBdKJIa9JU25LGOL5lUDM4nrzKZltxqlTV7zYCTbC3S+DC6L/Th4KR0MvrpAVc7jt7g4tZlvPHkziWivSKy3FEEMp92nlq1Vwvucb48w9eFlLANsreTG6PMHZhgVc43vNQEo7JOTbXaNHpObI/9GgRL9fd+H9lZcs3/nGw8qtSVpJAiXM4+JUf7uH2zjP9kQrF0AEvwcKBOpYjCfMJRmWmCJQ18jSOk2nrHVYGD0cZZ2mG7lcJpzqZUX8hTeT772UJ/WCv0AIhlZ3A/Pnc3zey4h/y6wOrrWbzY7ir1E9rOT+Q/OBapOuo2L9TW5K+R5hMfbusgVSpC/Ld7g4PY3dMEFDzxFInbBlOEAysCzJ5a7IX5WiK3MRgTzDZWPTO097br8+RqZJQrtL8NfGGaDgw446FdzdZDoyX/Ry0pOXd+sx5/1zmFaYDt8a1VFMLRxuERat48S1tW2RZI1X42oPpo2R7aPMd7YLIWmD2OqP2lEr6oRBT34CQ+rj8tGLZuuQHNd4oAGtXOEOrlxkLi8ApHWEcF4Mgzbvo0u4Z3hK5r+HStQ/P4LdMU6r0cGA8NyluuBGlLqs01gASK0Fk231lfp/UTwDiRBOo/gtDgZLEr0do2ChjxIT9TjQ0TtDjEmMrDfHn558PW5FilqgVoQLZDt4Wi0ARvjRIc+2cHYtqkVLGqL9XxzbeSNnBtCvvw2uLHb5rp X-Forefront-PRVS: 0274272F87 X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 23:fGCqT83aruBD98f0HtX0FxLYsNwUQKDSYOIHsfCIHojPxnibzEqxHa5Xdrw3gmUf9KExGn4P9DHeUo934sqGtqFcSsKuiLnxfQ3Vk5kNgmixVDrMhlcVjo2Lf1N4oc9mf7kaCcijUkOLzcmLALdEgosQ3htzxuOKdpAoUE3PzG+a5PZNAWUuTytCGnCVPu5xEfpQ7vJVxOVm58IlWcX8iBKcsbiz+Q6uz28vS2VOF7wdWoxMfc/tGQ2oe93ocsaNSEnkV0c8xH1Blb8jC5QrzZ+NUs+9VIaIHp0M+8EgFEmEIe5AOFH8l6XEHvgWDeRs/TaMnlNSnIL53rAj8zc4U4j89ewgy34A11TJFUH+3Bom0cijSC6+/hLupHqt8gRtNwkM3Sc6Wn9aG9IqiyLl+eaTrfRHofmIq9VDpbBtHFLxK/r6pSv89YCdDbIE4jrdaeunIMRO6dY5zpAJWscuff06cL+kbQsQkZ/yHz7EZ9AkCDSOFX0JTwsexcRqHJTHvWS8VsvpGekjRPISFbdwqz55fY6ydssI9j8DQKuJ4T3/cxWjDkU8I1jF4XxAhHGXWiGkUVRfwjL9BPTudY+11C9Ty/O7p5RdyHRRM6gCwEa/0N7YfxHM58/Prp0mMV/DfxqQnrIImP3Y02iJzAM6cZBRaQvR+Fk8m7KkXE/R1YdLL5MX9W+kxEgoPD66PIdk2lxZKyauLvL2cdYmg0iACPphztrSdUb3i0x6u7JmMaWzLKauzuBwXts7m06vWfSVgeir2FuEzMCm8YqO2C2egw/6G33NnXmO85eE8onWqfqPcC6HXJk9xqrM0kDe3uvgZrJF+8YoNmSV82tD5hukeAdzKCYg6q/to4aFN2jMBDdnlY6lVsRmm1j/UkJcmLIbqoKSitFVktteTeV10MuXaCUwbR0q7SDNFwRypVJcyyt4ZTGt0TBg7rH9AJTX/DCUh+szdKeROPnwnk0oaNKJ1mNjEEB2eHt8lvpwSWbBbk1saa++fNrnEsFXmWOMsJUZvKMV0qD0CgO9hLs70GcX/4JvPjDrugMkiNyw9hMRwSNqmncKWkcxWQDjiHSnftmtiyWTV+xrdDVRjngNlDaGmXQeJsBbx+hnRitcb4qUQFKrdUcJlUItgNhXBoU5wAtYthYhHi27ejpClkxdnzyBsg== X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 6:M2WVAgYaX7Olzlx6p19t/B5giQ+YdTuU3ogxC7EyGudPT35XWW4sVy6mYeVhbSy5nnEnIDHmxPQq0KZObcQi3FfYgxr6nV6ZnAQZgddcKU5tpxHQpLZS9ocpN3l1cG6Kjem0fyMGU/SWCYsY6kOiUFm53iAnEDw2njbkPw155vBitdlF+xGBYYbUkWncOXaDi7ghZwgfN5W2PPeuKyfKL2YkkXRI/jel91J1i36dpWB4X7+K5YbLWMnCHBSUHlPOjwVxI5g5ZaRDbIPCqVvy4w2BFDnwQTx0s0qfuktMebVrYMvePP0E+twhz6RmIVKlG3yidH6/4kNb5mR8kHm3bSanlPs13dsNy1Vkru+70qWZ7Mz1oAX9SRw8ZGo2cXkIpufgK77ujOZlmYH6OFwiAG68J55jF51Cm+qugDOL5S+9y8c3Rkz1P2Idk/EmM2fpgswBAWw5fki8xyPhfG1DCoWxW7w8+6/1DBMCQxlOPwM=; 5:vOLyXNPKmfSvdX91Ie2cWW6GbXB4rIo3FrGDQEcHM+EKsXf2SaA3pVwiyndFlv3V5HqanlQqbciF0ThihmjnxyTTGshtSTPJp50AaoUNjxFw2czfLJ7ptuPWCYAmYnZOxh6UO6qKz3+jnhzOEReRpMpfbNmsUK5sbCuSVgO3YjI=; 24:Nn/gLLWzryt16oTwAUVMutyKh0KzNWky86rF0x5aJafIjf4VTTLjYEAA/Fb9Y6TQUQNJxHVOWk/riHk256UFEkaRJWv+iZpTm1TnuVLJIpc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; MWHPR02MB2590; 7:L77nWyX6+s9Qh+tKYkIAYN4kEz2qQFou5zX4DQEMiv5/ZUZuzaC51E9X7VKqA0MUZ5bKV9knoq9DA3ZPK4L1XTssVLydRJwSImPUYiup4hR4fNlGGmbnZdo0OCYEeTj4uEeDKn5Kh8Kchcshz8UMJxkre0ZGy2qTcEIjqeI0aBKdEylUDUeOUBysEZujMqjySWgfm+xW2uu9RbPe4oxl9ZLA+xhbp1bHGqcrUBuv1rnlfmu5r8eBUtKngm/Jmg9X4qJp/XXGsJkMdExHMaXiE/0Mpd81XIz9wLiGVRgU+UJfObracOZ25uGs/GbUVWm7k8XGq5cx74XQZQe0YtxcXg== X-OriginatorOrg: xilinx.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Apr 2017 06:12:32.6499 (UTC) X-MS-Exchange-CrossTenant-Id: 657af505-d5df-48d0-8300-c31994686c5c X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=657af505-d5df-48d0-8300-c31994686c5c; Ip=[149.199.60.83]; Helo=[xsj-pvapsmtpgw01] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR02MB2590 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Roger Quadros This reverts commit 4fbac5206afd01b717d4bdc58793d471f3391b4b. This commit breaks g_webcam when used with uvc-gadget [1]. The user space application (e.g. uvc-gadget) is responsible for sending response to UVC class specific requests on control endpoint in uvc_send_response() in uvc_v4l2.c. The bad commit was causing a duplicate response to be sent with incorrect response data thus causing UVC probe to fail at the host and broken control transfer endpoint at the gadget. [1] - git://git.ideasonboard.org/uvc-gadget.git Cc: # v4.9+ Acked-by: Laurent Pinchart Signed-off-by: Roger Quadros Signed-off-by: Felipe Balbi --- drivers/usb/gadget/function/f_uvc.c | 7 ------- 1 file changed, 7 deletions(-) -- 2.7.4 diff --git a/drivers/usb/gadget/function/f_uvc.c b/drivers/usb/gadget/function/f_uvc.c index 27ed51b..29b41b5 100644 --- a/drivers/usb/gadget/function/f_uvc.c +++ b/drivers/usb/gadget/function/f_uvc.c @@ -258,13 +258,6 @@ uvc_function_setup(struct usb_function *f, const struct usb_ctrlrequest *ctrl) memcpy(&uvc_event->req, ctrl, sizeof(uvc_event->req)); v4l2_event_queue(&uvc->vdev, &v4l2_event); - /* Pass additional setup data to userspace */ - if (uvc->event_setup_out && uvc->event_length) { - uvc->control_req->length = uvc->event_length; - return usb_ep_queue(uvc->func.config->cdev->gadget->ep0, - uvc->control_req, GFP_ATOMIC); - } - return 0; }