From patchwork Wed Sep 23 09:21:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver Neukum X-Patchwork-Id: 297535 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=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 A0173C47426 for ; Wed, 23 Sep 2020 09:22:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5C73E20719 for ; Wed, 23 Sep 2020 09:22:15 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=suse.com header.i=@suse.com header.b="im8NhybU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726623AbgIWJWO (ORCPT ); Wed, 23 Sep 2020 05:22:14 -0400 Received: from mx2.suse.de ([195.135.220.15]:53724 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726557AbgIWJWG (ORCPT ); Wed, 23 Sep 2020 05:22:06 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1600852924; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:in-reply-to:in-reply-to:references:references; bh=enkvzSACilXPdBEKnE+T7BwCxIvLK9Ib/5smmf0iTFA=; b=im8NhybU1/hc9MFbaytwoEAFq3UESxoflFBOKCHn698ksNGcqBNWDxEGEk6ir0O2nxrgnl cWbtGWIBQquGK0W4v6tMkGcBRgAMMv5elnZcam8sTHeNeGNZVTbFPMHOySDOTKjjQS0+DH 5zlCmX3Yuf9hojEP6F/S/JD20YqxguM= Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id D5DD4AE14; Wed, 23 Sep 2020 09:22:41 +0000 (UTC) From: Oliver Neukum To: penguin-kernel@i-love.sakura.ne.jp, bjorn@mork.no, linux-usb@vger.kernel.org, gregKH@linuxfoundation.org Cc: Oliver Neukum Subject: [PATCH 5/7] CDC-WDM: correct error reporting in write() Date: Wed, 23 Sep 2020 11:21:34 +0200 Message-Id: <20200923092136.14824-6-oneukum@suse.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: <20200923092136.14824-1-oneukum@suse.com> References: <20200923092136.14824-1-oneukum@suse.com> Precedence: bulk List-ID: X-Mailing-List: linux-usb@vger.kernel.org In case our wait was interrupted by a disconnect, we should report that. Signed-off-by: Oliver Neukum --- drivers/usb/class/cdc-wdm.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/usb/class/cdc-wdm.c b/drivers/usb/class/cdc-wdm.c index 5fb855404403..242f83118208 100644 --- a/drivers/usb/class/cdc-wdm.c +++ b/drivers/usb/class/cdc-wdm.c @@ -396,6 +396,9 @@ static ssize_t wdm_write if (test_bit(WDM_RESETTING, &desc->flags)) r = -EIO; + if (test_bit(WDM_DISCONNECTING, &desc->flags)) + r = -ENODEV; + if (r < 0) { rv = r; goto out_free_mem_pm;