Received: by 10.213.65.68 with SMTP id h4csp526708imn; Fri, 16 Mar 2018 10:25:38 -0700 (PDT) X-Google-Smtp-Source: AG47ELuRszZHbLpjAsSUDT9HFg14zXrPG5liVLkOtzZhY9rxqwJ5GiU5cijXiAvtGHRrpxBC018H X-Received: by 2002:a17:902:5204:: with SMTP id z4-v6mr2957691plh.385.1521221138217; Fri, 16 Mar 2018 10:25:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521221138; cv=none; d=google.com; s=arc-20160816; b=hb60qEpzdcKActrarb31UhXemU9lRRMR+0/xT0JbX1yp0L8lGV9OGLE+PPBBw6fPVG Rrm8He21IDLxWF6xQFFhZUxGyaPTjkUXEEvBK/YBOcbtyrMRGCmxl1zPNPscMdbpSaSO g8kJ6pjuTeXOM+3MTLBtXsCkNtkJdK23eTnVl7HeLLYrcKAb+RZs0RB7SNPMqJQzeqnI F3sx2dXWStje8Btg8jtMzX8DdUxJe3ZXiJLVZhJ29ghdoq9KYvyHfBZIiMA6n+G43LcP DhVOZPPs4jwibZKXHHgXOeL2rCBvQmt2Ll8mPyf5PY5d47OW3qTHTxAAVue+nTB8IKFh VN1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=cGJzmQjI70G7d28Fv+YUh1yp6YrGS1E/RGJlHl3vqBw=; b=M7sYm4yPBxrluTMAHoMvmifJRk+XFoDFb4+gRj5CTNFe0UIHdZ741DNRJcxredRHYa 8ZwHXfrodmrRai3JmkwLu+Di8EpCfznXgP688luQpvq8aXy4OHOpWJ7PY5XUExp6avTZ M9QtD28JmSSd0KSbBcvRqVTA6glCyASBHiOHXyE4FLdjZ1NDGRbf/yWzUDacnDaup7U8 2vDfRFE3YZWhO5Ij7d/Q4mlSB9sm/UFi6DsP3K/1Ri1ppRW1Iq8g/doqLXs3X+9/1SZD eM0QXunqL3rKj8URz3+pxi0WCwMCNZuPHFq8PBH3rszcPz1gJDzHNJHMQhnjbK9P7JLf +9Vw== 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 ba10-v6si6422498plb.5.2018.03.16.10.25.22; Fri, 16 Mar 2018 10:25:38 -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 S933133AbeCPRYX (ORCPT + 99 others); Fri, 16 Mar 2018 13:24:23 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:36100 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933016AbeCPP3P (ORCPT ); Fri, 16 Mar 2018 11:29:15 -0400 Received: from localhost (LFbn-1-12247-202.w90-92.abo.wanadoo.fr [90.92.61.202]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 3FE67FB0; Fri, 16 Mar 2018 15:29:14 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Julia Lawall Subject: [PATCH 4.4 59/63] USB: usbmon: remove assignment from IS_ERR argument Date: Fri, 16 Mar 2018 16:23:31 +0100 Message-Id: <20180316152306.462072255@linuxfoundation.org> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180316152259.964532775@linuxfoundation.org> References: <20180316152259.964532775@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable 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 --- 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;