From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 10D11C33CAF for ; Thu, 16 Jan 2020 17:39:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D61DF2470D for ; Thu, 16 Jan 2020 17:39:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196359; bh=AVa866fKe1qBHTOu6xaczJQQ+P4Ng6xYLXj3lJ9ILX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sjLF2QJTnV5HSI1GdIiFZd6j9e/+XUw0d5sV5CmvMpFKn21sTzpT1UfSgLEeEqWH8 hxN1Mt0rZG6zmfBtEiW0yJCKVnH9DGXliUt/9TYvur0FH8A6HRNBtQo6Uaeqmq2bA9 eR3SYCe5hyVcan1oDvfUqSTlpW8cBaIszXdmCsI0= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2393456AbgAPRjR (ORCPT ); Thu, 16 Jan 2020 12:39:17 -0500 Received: from mail.kernel.org ([198.145.29.99]:55486 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2393452AbgAPRjQ (ORCPT ); Thu, 16 Jan 2020 12:39:16 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 18B66246EF; Thu, 16 Jan 2020 17:39:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579196356; bh=AVa866fKe1qBHTOu6xaczJQQ+P4Ng6xYLXj3lJ9ILX4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Hh71MEGX2ad9Clodk/Gp4imF5j0IQsoBSOabJUmky+92WS6r4ZT4dOj1ibQu6PHZK hdhoZPk3+o66Yr+kPYX+69yisv4vDsSX8Sd/+ZLEn1N5FdjRm2CvIAoivykos2ic0Y HOi1IZ2/7Vo/3QdWWQF0QCfo294M48sYzFtRAtvY= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Lu Baolu , Joerg Roedel , Sasha Levin , iommu@lists.linux-foundation.org Subject: [PATCH AUTOSEL 4.9 148/251] iommu: Use right function to get group for device Date: Thu, 16 Jan 2020 12:34:57 -0500 Message-Id: <20200116173641.22137-108-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116173641.22137-1-sashal@kernel.org> References: <20200116173641.22137-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Lu Baolu [ Upstream commit 57274ea25736496ee019a5c40479855b21888839 ] The iommu_group_get_for_dev() will allocate a group for a device if it isn't in any group. This isn't the use case in iommu_request_dm_for_dev(). Let's use iommu_group_get() instead. Fixes: d290f1e70d85a ("iommu: Introduce iommu_request_dm_for_dev()") Signed-off-by: Lu Baolu Signed-off-by: Joerg Roedel Signed-off-by: Sasha Levin --- drivers/iommu/iommu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c index 87d3060f8609..8163a42be9ff 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -1581,9 +1581,9 @@ int iommu_request_dm_for_dev(struct device *dev) int ret; /* Device must already be in a group before calling this function */ - group = iommu_group_get_for_dev(dev); - if (IS_ERR(group)) - return PTR_ERR(group); + group = iommu_group_get(dev); + if (!group) + return -EINVAL; mutex_lock(&group->mutex); -- 2.20.1