From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com ([134.134.136.65]:37032 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752705AbdAKRaa (ORCPT ); Wed, 11 Jan 2017 12:30:30 -0500 From: Felipe Balbi To: Bin Liu Cc: stable@vger.kernel.org, Greg Kroah-Hartman , linux-usb@vger.kernel.org Subject: Re: [v4.4.40] patch backport error In-Reply-To: <20170111172236.GC18730@uda0271908> References: <20170111171305.GB18730@uda0271908> <87pojt5xl1.fsf@linux.intel.com> <20170111172236.GC18730@uda0271908> Date: Wed, 11 Jan 2017 19:28:35 +0200 Message-ID: <87k2a1o69o.fsf@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: stable-owner@vger.kernel.org List-ID: Hi, Bin Liu writes: > On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote: >> >> hi, >> >> Bin Liu writes: >> > I am unable to figure out what was happening, but there seems to be a >> > patch backport error in v4.4.40. >> > >> > Commit c53af76d5de1 (usb: gadget: composite: always set ep->mult to a >> > sensible value) is backported from upstream >> > eaa496ffaaf19591fe471a36cef366146eeb9153, however c53af76d5de1 has >> > >> > + _ep->mult = usb_endpoint_maxp(_ep->desc) & 0x7ff; >> > >> > but eaa496ffaaf19591fe471a36cef366146eeb9153 has >> > >> > + _ep->mult = usb_endpoint_maxp_mult(_ep->desc); >> > >> > they are not consistant. >> > >> > I haven't checked v4.9 yet, not sure if this happens there too. >> >> oh-oh. you're correct, I sent the wrong patch :-( > > so you sent a separate set to stable? I thought it was directly back > ported from upstream which has the correct version? well, it had to be manually backported to do away with the dependency on usb_endpoint_maxp_mult(), but I ended up reimplementing usb_endpoint_maxp() correctly instead of actually extracting high bits of wMaxPacketSize -- balbi