Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp2531148pxj; Mon, 10 May 2021 05:18:21 -0700 (PDT) X-Google-Smtp-Source: ABdhPJw/cwiR35V6oB1Svj8PGdCkmFAty7LFDBCANpBBZqo+VLIxRxfTrRSIRmHlSf0lBcHdx+vP X-Received: by 2002:a17:906:c2cc:: with SMTP id ch12mr24730895ejb.402.1620649101219; Mon, 10 May 2021 05:18:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620649101; cv=none; d=google.com; s=arc-20160816; b=RvLApA1r9tnaDx0bnaA6/Ix9RoVmKQm1b51iy8Zsa5eX1SeUnLgrceVRGymP01iCIj mqV7GH/7OM7jjE2gT/jMPrnw7GSMDWAtXTijRsjWfZmZUhtM14lEKqBp++d1SIiOkUAr PTFxdNbz1vMgaYlJke7SuR+REh7jFj+sWbOBvVQ04gDPJjECOjiDrmAgd6YbWGjBbz78 wEpfdEAOB7E9yfLnczmH0KupIZvsp1UlcOLvffsUQ3dkWxzAcDwg/k0Y+eG1klr3ZIdK GCavj/h3pFN3+kvaoEesxNh4qaInGWCEkTtrAKQeF2+uYFto2yeJX4KGBuO+JjYbHOx6 AL+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=FqNhZi//oB2+tO8r2tpqZPLqxyA2tPzi5QsAr4U+jfo=; b=bQSwc8tXkMzorc4MZfAt756VmZWpN6OSS2+/ZcVsyXBwyhTze4/RsYULV+EFZjjtwD E1fDklTnRofxPm9bjqvLLJdfmtOVtMTL1D6aVzmtw+20TeLpn0MBzIH10gpGdiYiLueM 7N4OZtCuGCvWRgRNcLGHJPdQszyggld5DSTjSftdoidfLEYde7Kx+np9t0CeGL4N4Q1J xeaZb/lU6p3uWKhMGCqEcOwUiKtnuhu9dI9PSK6E0568V0pGNXXQ2jImlQyuAS4AuaYr E31xi7Xvfy39yDwZBVbx0f0SPLrb1KvQyths+2NUELrETZSbc+oCmc8GWGF1FumswIz1 Iu+Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OIGZHlZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id v13si13293643ejb.671.2021.05.10.05.17.57; Mon, 10 May 2021 05:18:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OIGZHlZe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344320AbhEJMPd (ORCPT + 99 others); Mon, 10 May 2021 08:15:33 -0400 Received: from mail.kernel.org ([198.145.29.99]:46148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236051AbhEJLHX (ORCPT ); Mon, 10 May 2021 07:07:23 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id CB5AA61601; Mon, 10 May 2021 10:57:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1620644267; bh=SXHcvkIHG65SWdaJ9wcHixLLVYNskMBHMiLpyLnMs7E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OIGZHlZeTn+Prw4Pub8+am600vh485djQ7RKyT73AaNL0ZNwIGkVQl3/Y0HOc7bX6 s8sItsi71CrXJ5qTYwihNUxgrMw6gu+yfKWIzZhbsZ9glihF5r3WjcovAh+f9HsnFr OKQvA1x/Ne3yuMhLPvmZaeaPqemZRTa1YgnM4rOk= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Christian Ehrhardt , Vineeth Vijayan , Julian Wiedmann , Peter Oberparleiter , Heiko Carstens Subject: [PATCH 5.12 013/384] s390/cio: remove invalid condition on IO_SCH_UNREG Date: Mon, 10 May 2021 12:16:42 +0200 Message-Id: <20210510102015.316651017@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210510102014.849075526@linuxfoundation.org> References: <20210510102014.849075526@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vineeth Vijayan commit 2f7484fd73729f89085fe08d683f5a8d9e17fe99 upstream. The condition to check the cdev pointer validity on css_sch_device_unregister() is a leftover from the 'commit 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver")'. This could lead to a situation, where detaching the device is not happening completely. Remove this invalid condition in the IO_SCH_UNREG case. Link: https://lore.kernel.org/r/20210423100843.2230969-1-vneethv@linux.ibm.com Fixes: 8cc0dcfdc1c0 ("s390/cio: remove pm support from ccw bus driver") Reported-by: Christian Ehrhardt Suggested-by: Christian Ehrhardt Cc: Signed-off-by: Vineeth Vijayan Tested-by: Julian Wiedmann Reviewed-by: Peter Oberparleiter Tested-by: Christian Ehrhardt Signed-off-by: Heiko Carstens Signed-off-by: Greg Kroah-Hartman --- drivers/s390/cio/device.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- a/drivers/s390/cio/device.c +++ b/drivers/s390/cio/device.c @@ -1532,8 +1532,7 @@ static int io_subchannel_sch_event(struc switch (action) { case IO_SCH_ORPH_UNREG: case IO_SCH_UNREG: - if (!cdev) - css_sch_device_unregister(sch); + css_sch_device_unregister(sch); break; case IO_SCH_ORPH_ATTACH: case IO_SCH_UNREG_ATTACH: