Received: by 2002:ac0:a5b6:0:0:0:0:0 with SMTP id m51-v6csp2384488imm; Thu, 7 Jun 2018 09:43:16 -0700 (PDT) X-Google-Smtp-Source: ADUXVKIhh5Fz6zFQQPsl5cikZ1rxJAAh//t5Y11SpVTO+14zGvbujy7+kVzPpmn5QSABzpP+Ysds X-Received: by 2002:a17:902:422:: with SMTP id 31-v6mr2862820ple.320.1528389796439; Thu, 07 Jun 2018 09:43:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528389796; cv=none; d=google.com; s=arc-20160816; b=SPuLhECu8c2lNhItkyO1AQwCuHNlkaIDLPkW8i5uai5G8GdHJs1YwvfXgikwdjWHeb mUn97j63dRAOsGna6IRNtDZi1s5MC75kbc9JqNhjM9nUPkmUaXA74u8NUO2A20n7Cr64 fWO0C9DLMgXsuZed3ghvXRDG7OLMnpHAA7ZDocLRrDTs8+KoAzzEScjOYdwfOoU08BeZ llh5XdyEqcBDtBPSJNaEUIRbdZUGewRKAZlYP+i6FIHAO6Hh034Qn7jCGvcm8PG3AWWL bdcku2p3lPL5/AWoHAmRyDBvxYna7xe0URbslJQoshr037LkEVeFKVb9brcjok5WOq+f LeGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:in-reply-to:subject:message-id:date:cc:to :from:mime-version:content-transfer-encoding:content-disposition :arc-authentication-results; bh=W8jWdlAwm6cZmjnyz5U8umFmJSOCydXmaNXqdAtn7J0=; b=Q1WviPT6UIeFr6ASGIQjih5SUvvtAez+JAM4xRt00bWvVcVrUCXYLfS6Urk6g7v48T l377ONgk6O39CyyndSQT5vWPBjB+D+X/in3ptgm8pWbNnY01FLUSFMdlHe90u0i2UBhJ B4nn/+mnNJewzUm02xARmzo0V1cvosXLTFhRi7lFD98yiD6xIPFmF4iDsIfwCFvEOE0W x5ZKEfVOF+Ov+tmazAbBKigoCTNAHGkmrXH2Pulznig6tdBIlGVa/sRfDR78nJj8+0+F QZyNcILg94ujJtC3ZsxVmDa4U19/lTHf/kfrPmYh4DrEH2NHB4/My8/Lmb5QCUDHCWqH S3NQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c3-v6si54369844pfn.245.2018.06.07.09.43.01; Thu, 07 Jun 2018 09:43:16 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933650AbeFGO0q (ORCPT + 99 others); Thu, 7 Jun 2018 10:26:46 -0400 Received: from shadbolt.e.decadent.org.uk ([88.96.1.126]:40185 "EHLO shadbolt.e.decadent.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932814AbeFGO0n (ORCPT ); Thu, 7 Jun 2018 10:26:43 -0400 Received: from [148.252.241.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.84_2) (envelope-from ) id 1fQvbQ-0005Zi-Mj; Thu, 07 Jun 2018 15:09:25 +0100 Received: from ben by deadeye with local (Exim 4.91) (envelope-from ) id 1fQvbC-0003D2-8k; Thu, 07 Jun 2018 15:09:10 +0100 Content-Type: text/plain; charset="UTF-8" Content-Disposition: inline Content-Transfer-Encoding: 8bit MIME-Version: 1.0 From: Ben Hutchings To: linux-kernel@vger.kernel.org, stable@vger.kernel.org CC: akpm@linux-foundation.org, "Julia Lawall" , "Greg Kroah-Hartman" Date: Thu, 07 Jun 2018 15:05:21 +0100 Message-ID: X-Mailer: LinuxStableQueue (scripts by bwh) Subject: [PATCH 3.16 338/410] USB: usbmon: remove assignment from IS_ERR argument In-Reply-To: X-SA-Exim-Connect-IP: 148.252.241.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.16.57-rc1 review patch. If anyone has any objections, please let me know. ------------------ From: Julia Lawall commit 46c236dc7d1212d7417e6fb0317f91c44c719322 upstream. The semantic patch that makes this change is as follows: (http://coccinelle.lip6.fr/) // @@ expression e1,e2; statement S1,S2; @@ +e1 = e2; if (IS_ERR( e1 - = e2 )) S1 else S2 // Signed-off-by: Julia Lawall Signed-off-by: Greg Kroah-Hartman Signed-off-by: Ben Hutchings --- drivers/usb/mon/mon_text.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) --- a/drivers/usb/mon/mon_text.c +++ b/drivers/usb/mon/mon_text.c @@ -386,7 +386,8 @@ static ssize_t mon_text_read_t(struct fi struct mon_event_text *ep; struct mon_text_ptr ptr; - if (IS_ERR(ep = mon_text_read_wait(rp, file))) + ep = mon_text_read_wait(rp, file); + if (IS_ERR(ep)) return PTR_ERR(ep); mutex_lock(&rp->printf_lock); ptr.cnt = 0; @@ -413,7 +414,8 @@ static ssize_t mon_text_read_u(struct fi struct mon_event_text *ep; struct mon_text_ptr ptr; - if (IS_ERR(ep = mon_text_read_wait(rp, file))) + ep = mon_text_read_wait(rp, file); + if (IS_ERR(ep)) return PTR_ERR(ep); mutex_lock(&rp->printf_lock); ptr.cnt = 0;