From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <stable-owner@vger.kernel.org>
Received: from mga09.intel.com ([134.134.136.24]:39369 "EHLO mga09.intel.com"
        rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
        id S933163AbdAKRPW (ORCPT <rfc822;stable@vger.kernel.org>);
        Wed, 11 Jan 2017 12:15:22 -0500
From: Felipe Balbi <balbi@kernel.org>
To: Bin Liu <b-liu@ti.com>, stable@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        linux-usb@vger.kernel.org
Subject: Re: [v4.4.40] patch backport error
In-Reply-To: <20170111171305.GB18730@uda0271908>
References: <20170111171305.GB18730@uda0271908>
Date: Wed, 11 Jan 2017 19:13:30 +0200
Message-ID: <87pojt5xl1.fsf@linux.intel.com>
MIME-Version: 1.0
Content-Type: text/plain
Sender: stable-owner@vger.kernel.org
List-ID: <stable.vger.kernel.org>


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?

-- 
balbi