Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp824848imu; Tue, 11 Dec 2018 08:08:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/WxSZHvsMntuXphMmraaZqeN3voa2wTjb2YtrUAKBVo8RuGQ8MlS1G9VaADozQ0PTOD+Z6P X-Received: by 2002:a17:902:728c:: with SMTP id d12mr16358353pll.284.1544544524898; Tue, 11 Dec 2018 08:08:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544544524; cv=none; d=google.com; s=arc-20160816; b=fUYjAKVY5frTyXW3UQVFwNIm3vQgl+ITIYSenjTSbABXaWzI5tS52HRyXOgE61AcWK 5rDzP+wFM1ghfHdSue2s10r7z1XdXqUkYCq7ib4N25WzgmpoDvBDr/mRBq7fP5RR1Ygj 6q/2t+KDdHTO6cAx25v4al5zpqqmR71+cqD+c8w6XyGoVpd1OgexNdPxBlxXNiwXhu3L WLltttKE/yaUSPc0XL7d8TETS6daz3fYE6ZD5VzRvVBhrh4pUI08+qNkI6W4MuzJcm2k J02/xMPTviC5I9AK1OnofLRfQNiIcdG9Vh1LPDI4WS6cXxOhHG1MkQVuhGhOUL5mvR8s G4Og== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=7eML5d3Lbh6J2uN+QuYtLVh0V7MuBM53MNiipo7akDk=; b=UDeHFi04VkMK9q+3OygUkBGt7upV+jPuhB+N9aVInBfNgHtXQnNawyr8zYsrTaNS3J alxGe+oIdynOvGouNtsWqVDyARUhC1eCkMeCGB8V66bQEWb+/pV41wnPY8ws7/YJoLVs sbfnkUvOSs4oiELcmvEwo6ODBO0F/aCLhCazVsgCu8ZWMo+anMj/1gXniYbBL8ajTlUM 6vIDAbdb8O4j/4cDSq2A8h27FNdBfCV/cF96l4pegOewjtMqth4Jj4CRBW6VpZiWiJ3J I5c8MTc4QPJOmOFNfxn5h/htxvhApYARnPx4kYjkf5jGaXlFoRj+uL4+u8Az4ubcV/mK QfaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=deWOk5j3; 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 l38si13211064plb.48.2018.12.11.08.08.30; Tue, 11 Dec 2018 08:08:44 -0800 (PST) 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; dkim=pass header.i=@kernel.org header.s=default header.b=deWOk5j3; 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 S1730923AbeLKQF2 (ORCPT + 99 others); Tue, 11 Dec 2018 11:05:28 -0500 Received: from mail.kernel.org ([198.145.29.99]:43924 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730343AbeLKPzR (ORCPT ); Tue, 11 Dec 2018 10:55:17 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 6109F2146D; Tue, 11 Dec 2018 15:55:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1544543716; bh=cx2yN399sfSPq4e/34CN0BofMuHAy22bp7Tlv0abq6A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=deWOk5j3vyHzuy2Elz1DD9vWg9HbV6EzVJvvUGubF3tsmgvfvsiL0icDyNaExE3EM YFySEWi441lqDBmJcM4EAfhrJtZlJLV43f8XxZSp2IJV6unIiRwpmB9WrDqBpdQOR1 T72Vp1F2a62cPI7L3LzzCyX8W+WsQTHvzi8rj1oA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Sakari Ailus , Bingbu Cao , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.19 004/118] media: ipu3-cio2: Unregister device nodes first, then release resources Date: Tue, 11 Dec 2018 16:40:23 +0100 Message-Id: <20181211151644.396154031@linuxfoundation.org> X-Mailer: git-send-email 2.20.0 In-Reply-To: <20181211151644.216668863@linuxfoundation.org> References: <20181211151644.216668863@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 32388d6ef7cffc7d8291b67f8dfa26acd45217fd ] While there are issues related to object lifetime management, unregister the media device first, followed immediately by other device nodes when the driver is being unbound. Only then the resources needed by the driver may be released. This is slightly safer. Signed-off-by: Sakari Ailus Tested-by: Bingbu Cao Reviewed-by: Bingbu Cao Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/pci/intel/ipu3/ipu3-cio2.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/pci/intel/ipu3/ipu3-cio2.c b/drivers/media/pci/intel/ipu3/ipu3-cio2.c index 29027159eced..ca1a4d8e972e 100644 --- a/drivers/media/pci/intel/ipu3/ipu3-cio2.c +++ b/drivers/media/pci/intel/ipu3/ipu3-cio2.c @@ -1846,12 +1846,12 @@ static void cio2_pci_remove(struct pci_dev *pci_dev) struct cio2_device *cio2 = pci_get_drvdata(pci_dev); unsigned int i; + media_device_unregister(&cio2->media_dev); cio2_notifier_exit(cio2); - cio2_fbpt_exit_dummy(cio2); for (i = 0; i < CIO2_QUEUES; i++) cio2_queue_exit(cio2, &cio2->queue[i]); + cio2_fbpt_exit_dummy(cio2); v4l2_device_unregister(&cio2->v4l2_dev); - media_device_unregister(&cio2->media_dev); media_device_cleanup(&cio2->media_dev); mutex_destroy(&cio2->lock); } -- 2.19.1