From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mail.linuxfoundation.org ([140.211.169.12]:43222 "EHLO
        mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1752415AbdAKUQs (ORCPT
        <rfc822;stable@vger.kernel.org>); Wed, 11 Jan 2017 15:16:48 -0500
Date: Wed, 11 Jan 2017 21:17:02 +0100
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Felipe Balbi <balbi@kernel.org>
Cc: Bin Liu <b-liu@ti.com>, stable@vger.kernel.org,
        linux-usb@vger.kernel.org
Subject: Re: [v4.4.40] patch backport error
Message-ID: <20170111201702.GD16314@kroah.com>
References: <20170111171305.GB18730@uda0271908>
 <87pojt5xl1.fsf@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <87pojt5xl1.fsf@linux.intel.com>
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>

On Wed, Jan 11, 2017 at 07:13:30PM +0200, Felipe Balbi wrote:
> 
> hi,
> 
> Bin Liu <b-liu@ti.com> 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 :-(
> 
> I'll send a correct patch tomorrow. Greg, do you want a revert followed
> by correct patch, or just fix-up patch?

A simple fixup is fine.

thanks,

greg k-h