On Mon, Oct 06, 2014 at 10:48:28AM +0200, Hans de Goede wrote:
> Hi,
>
> On 10/06/2014 02:03 AM, Greg Kroah-Hartman wrote:
> > On Fri, Oct 03, 2014 at 11:42:38AM +0200, Hans de Goede wrote:
> >> Reported-by: kbuild test robot <fengguang.wu@xxxxxxxxx>
> >> Cc: stable@xxxxxxxxxxxxxxx # 3.16
> >> Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx>
> >> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> >> --
> >> Upstream commit-id a79e5bc53a9519202dfad7d916761601fcbf8db1
> >> ---
> >> drivers/usb/storage/uas-detect.h | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/drivers/usb/storage/uas-detect.h b/drivers/usb/storage/uas-detect.h
> >> index 1e298ec..8a6f371 100644
> >> --- a/drivers/usb/storage/uas-detect.h
> >> +++ b/drivers/usb/storage/uas-detect.h
> >> @@ -73,8 +73,8 @@ static int uas_use_uas_driver(struct usb_interface *intf,
> >> * broken on the ASM1051, use the number of streams to differentiate.
> >> * New ASM1053-s also support 32 streams, but have a different prod-id.
> >> */
> >> - if (udev->descriptor.idVendor == 0x174c &&
> >> - udev->descriptor.idProduct == 0x55aa) {
> >> + if (le16_to_cpu(udev->descriptor.idVendor) == 0x174c &&
> >> + le16_to_cpu(udev->descriptor.idProduct) == 0x55aa) {
> >> if (udev->speed < USB_SPEED_SUPER) {
> >> /* No streams info, assume ASM1051 */
> >> flags |= US_FL_IGNORE_UAS;
> >
> > This doesn't apply either :(
> >
> > Can you respin these last 2 patches, something got out of sync.
>
> Weird, I just did a rebase of my linux-3.16.y branch on top of:
>
> 36b54ba2a114b60bd2c8d5de84d2aa49ec9a64fc "Linux 3.16.4"
>
> And that went without a glitch. I'll send out a v2 of this set,
> based on top of 3.16.4.
>
> Note I got notification mails that you've already applied the
> first 2 of this set, put you do not seem to have those changes
> pushed out yet, so I'm resending the entire set to be sure.
They should be in the stable-queue.git tree on git.kernel.org, I pushed
them there when you got the emails...
Anyway, I'll go through your new patch set now and see if that works.
thanks,
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html