From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6E74FC43603 for ; Mon, 16 Dec 2019 18:15:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 474B220CC7 for ; Mon, 16 Dec 2019 18:15:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520103; bh=Wm1ku6Alg7T5Ja1Bgxx+9qYOfyQ9wOzROKYjzfqDVjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=c54K/hvKI5R4ijpQd3JZoox554aZ+GTIxkm7bcMbTcgcNWhPXUPEEjmjxP/rlaYuW bcv832PMxmURhT9dBASR4KsNqlzrQmEzfyIJwnuxgdUEGCTCaQXjqHP/UElz3r/fvy 6BSgcNVhtwMQdXdoZIeWCcWNQryBJjka1Stq2yKA= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730492AbfLPSPB (ORCPT ); Mon, 16 Dec 2019 13:15:01 -0500 Received: from mail.kernel.org ([198.145.29.99]:35092 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731305AbfLPSO4 (ORCPT ); Mon, 16 Dec 2019 13:14:56 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A9068207FF; Mon, 16 Dec 2019 18:14:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576520096; bh=Wm1ku6Alg7T5Ja1Bgxx+9qYOfyQ9wOzROKYjzfqDVjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=db6gKMhBg571niQegol85HOa3q6X/RL8Rd1Ylta/2GtgtVAKAac4RIQ5n0WeGM9p9 vOIH5LBY6DleVsnT4tFQ80Mu1M9o4JS2NBKFDDHPqnsVrqMCO9JL2rEPjBUPf6jMcG 8+KPiqBTFW0gWtbp2pXNQ9H7HLxzRQ9Rklcf/9Ng= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Oliver Neukum Subject: [PATCH 5.4 015/177] USB: uas: heed CAPACITY_HEURISTICS Date: Mon, 16 Dec 2019 18:47:51 +0100 Message-Id: <20191216174815.945508601@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191216174811.158424118@linuxfoundation.org> References: <20191216174811.158424118@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Oliver Neukum commit 335cbbd5762d5e5c67a8ddd6e6362c2aa42a328f upstream. There is no need to ignore this flag. We should be as close to storage in that regard as makes sense, so honor flags whose cost is tiny. Signed-off-by: Oliver Neukum Cc: stable Link: https://lore.kernel.org/r/20191114112758.32747-3-oneukum@suse.com Signed-off-by: Greg Kroah-Hartman --- drivers/usb/storage/uas.c | 6 ++++++ 1 file changed, 6 insertions(+) --- a/drivers/usb/storage/uas.c +++ b/drivers/usb/storage/uas.c @@ -838,6 +838,12 @@ static int uas_slave_configure(struct sc sdev->fix_capacity = 1; /* + * in some cases we have to guess + */ + if (devinfo->flags & US_FL_CAPACITY_HEURISTICS) + sdev->guess_capacity = 1; + + /* * Some devices don't like MODE SENSE with page=0x3f, * which is the command used for checking if a device * is write-protected. Now that we tell the sd driver