Received: by 2002:a05:6a11:4021:0:0:0:0 with SMTP id ky33csp4343946pxb; Mon, 27 Sep 2021 15:04:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKh+t/nRs3jKIV3FzS3tSYiIYN2hQE9yXbMQwkVpCQaa8Sd2QZzGuxMParEM2X7UxmX/U6 X-Received: by 2002:a62:9242:0:b0:446:5771:7901 with SMTP id o63-20020a629242000000b0044657717901mr2197040pfd.81.1632780294276; Mon, 27 Sep 2021 15:04:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1632780294; cv=none; d=google.com; s=arc-20160816; b=JQTKmFh6lImjCflflY7UurKyqWGR+xUlnXmt3dkRYDQiJ/ag4ntcCJXVHl/js0NEl3 OyoHWlfh0R9p38/sdQStFXABJgmoj0TGSqK6icIPknzoP2ewQIcczqtFeJsnU6J6YUv2 vyuAXl/xZTj8d9h6nozFeWI7ktg47mzB6XVFfzsw+ppurJMjI9JDuloYcc7PLf3MFFm5 7bwif9xekbLV6dc7IJRVcsZ86QCkstk88ZaguzDB2NFqpDNh8Kw3eB2TUsDRU35pGP0y MNVwETFEbc7Lo93+B2J1/3jG99nWDalqO6lmET+rmVZJ84mCuclnrJ7+oEP6l2SDIaV6 gzTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=8Tqj5TdypJFI9LKCX1GYcX8SMXGQKJv6MnhgBe11KFw=; b=wL/fxa6C2+EFizxtv6mDZ6iE6ZKm7ssw9c1PZYZztYNfTKSv5x80g2jmg61tnLWY3u QTxq35rAVnOvwqPEwpJCf1Pame+MYMeHoqPDRfZk/ntiPf0qzKDU8SfLN0/Tn/emM1le p+VvypJrrEqP6pL0hD4Px9B2ycTIeQMwWnx9mtdoGEDmyDDiRaF1o6wEUiCbdIZc6xKP rHmnLshQYKzD2fDgSuZ83+Ah7jZg/O4QgprESLyjkfeoxzZ2swgy7MdetrgbIFUfPXiZ 3Wa/v6brQnnWN3y7DxjpE7tZOBNINJjvQTZHwfg/BMZcnnSZgG5TbWU5wLlSFHGWnc5S CMrg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20210309 header.b=mzs3LZQa; 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=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id p6si6289067plq.402.2021.09.27.15.04.41; Mon, 27 Sep 2021 15:04:54 -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=@infradead.org header.s=bombadil.20210309 header.b=mzs3LZQa; 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=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237990AbhI0WEW (ORCPT + 99 others); Mon, 27 Sep 2021 18:04:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50792 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237678AbhI0WDg (ORCPT ); Mon, 27 Sep 2021 18:03:36 -0400 Received: from bombadil.infradead.org (unknown [IPv6:2607:7c80:54:e::133]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DB11BC061203; Mon, 27 Sep 2021 15:01:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Reply-To:Content-Type:Content-ID:Content-Description; bh=8Tqj5TdypJFI9LKCX1GYcX8SMXGQKJv6MnhgBe11KFw=; b=mzs3LZQa/W+/kFjAVDF2BntjfL PZjeTLtE7vD4VHrvKk12WqIjPIkdNzWkdRxHe9pzEFQOBs9JLDVJTk0h8oEvECSLdYuCeL6EYHCz/ F63qAuwhJrIvKlVPT9Ekp9vi8B4CJz5gX9/F9r6rfdskHPMHSs2hxpQOVZyksJOuA6R35xeQadBua nR0n+PkjEzzjVunTdZGw8qirchD3uQ73eLPSp7TGeQy9lO+jLtGXu0jRtXqpfVLtpz9WZbWilltyq wTZDY4U5UMhtjlic8pV3eaHBYf/47UYExbcFDQmhE5zO/I2HzzBt90ikAf+Kpxrwc52vZ5THOvWes 0mHDoFNg==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mUygS-004TPi-8D; Mon, 27 Sep 2021 22:01:12 +0000 From: Luis Chamberlain To: axboe@kernel.dk, justin@coraid.com, geert@linux-m68k.org, ulf.hansson@linaro.org, hare@suse.de, tj@kernel.org, philipp.reisner@linbit.com, lars.ellenberg@linbit.com, jdike@addtoit.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes.berg@intel.com, chris.obbard@collabora.com, krisman@collabora.com, zhuyifei1999@gmail.com, thehajime@gmail.com, chris@zankel.net, jcmvbkbc@gmail.com, tim@cyberelk.net Cc: linux-xtensa@linux-xtensa.org, linux-um@lists.infradead.org, linux-m68k@lists.linux-m68k.org, drbd-dev@lists.linbit.com, linux-block@vger.kernel.org, linux-kernel@vger.kernel.org, Luis Chamberlain Subject: [PATCH v2 13/15] pcd: fix ordering of unregister_cdrom() Date: Mon, 27 Sep 2021 15:01:08 -0700 Message-Id: <20210927220110.1066271-14-mcgrof@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210927220110.1066271-1-mcgrof@kernel.org> References: <20210927220110.1066271-1-mcgrof@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: Luis Chamberlain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We first register cdrom and then we add_disk() and so we we should likewise unregister the cdrom first and then del_gendisk(). Signed-off-by: Luis Chamberlain --- drivers/block/paride/pcd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/paride/pcd.c b/drivers/block/paride/pcd.c index a7fab3830d7b..82a654fc4db8 100644 --- a/drivers/block/paride/pcd.c +++ b/drivers/block/paride/pcd.c @@ -1021,9 +1021,9 @@ static void __exit pcd_exit(void) if (!cd->present) continue; + unregister_cdrom(&cd->info); del_gendisk(cd->disk); pi_release(cd->pi); - unregister_cdrom(&cd->info); blk_cleanup_disk(cd->disk); blk_mq_free_tag_set(&cd->tag_set); -- 2.30.2