From patchwork Thu Nov 15 16:43:18 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiang Liu X-Patchwork-Id: 1750821 Return-Path: X-Original-To: patchwork-kvm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 6FC4CDF2AB for ; Thu, 15 Nov 2012 16:45:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1768474Ab2KOQon (ORCPT ); Thu, 15 Nov 2012 11:44:43 -0500 Received: from mail-pa0-f46.google.com ([209.85.220.46]:55490 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1768408Ab2KOQom (ORCPT ); Thu, 15 Nov 2012 11:44:42 -0500 Received: by mail-pa0-f46.google.com with SMTP id hz1so1190476pad.19 for ; Thu, 15 Nov 2012 08:44:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=vM49sOjguRdob0ado0I3liHQu4gbYV8Tjz5fCQVQJms=; b=SUshOKwq1Wop/ygrDCxnS39j0gPfwI/bz07slrXcAwsZY5929g62TZ7SiMM4EUfMtu BEahBOXUhelNNt9eJqOFADpwwDgLpk9MZ4iPUB/VjWwvHl4Kfa4KptFKnNFzURYGym8w QsamnhtWktn37aJ6xthK6y+sIyzDcH6HYopKTajrv5oCt/CO7XLvfOlsDhFlYRiEQaJb l2dDFSb5CskAKb0FjyZ1gxmlkW0glJHzFkRXWRSljL+L8LQwcbjKR2DxAPhNaTbc1PIF 6uGO0NFz0ZALisc0WjE+ci3a0C6Y5eVphlIZo3NlGlyu8MoEWkh1i5if3ZP7I2umT5mC Sxow== Received: by 10.66.79.133 with SMTP id j5mr4710095pax.51.1352997882290; Thu, 15 Nov 2012 08:44:42 -0800 (PST) Received: from localhost.localdomain ([120.193.5.254]) by mx.google.com with ESMTPS id bd2sm9962516pab.36.2012.11.15.08.44.39 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 15 Nov 2012 08:44:41 -0800 (PST) From: Jiang Liu To: Alex Williamson , Greg Kroah-Hartman Cc: Jiang Liu , Joerg Roedel , kvm@vger.kernel.org, linux-kernel@vger.kernel.org, Hanjun Guo Subject: [PATCH v2 3/3] VFIO: fix out of order labels for error recovery in vfio_pci_init() Date: Fri, 16 Nov 2012 00:43:18 +0800 Message-Id: <1352997798-18891-3-git-send-email-jiang.liu@huawei.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1352997798-18891-1-git-send-email-jiang.liu@huawei.com> References: <1352997798-18891-1-git-send-email-jiang.liu@huawei.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org The two labels for error recovery in function vfio_pci_init() is out of order, so fix it. Signed-off-by: Jiang Liu --- drivers/vfio/pci/vfio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 6968b72..d07fb7e 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -563,9 +563,9 @@ static int __init vfio_pci_init(void) return 0; -out_virqfd: - vfio_pci_virqfd_exit(); out_driver: + vfio_pci_virqfd_exit(); +out_virqfd: vfio_pci_uninit_perm_bits(); return ret; }