From patchwork Thu May 2 05:17:31 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 240894 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from ozlabs.org (localhost [IPv6:::1]) by ozlabs.org (Postfix) with ESMTP id 1A4212C01BF for ; Thu, 2 May 2013 15:18:05 +1000 (EST) Received: from mail-bk0-x231.google.com (mail-bk0-x231.google.com [IPv6:2a00:1450:4008:c01::231]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id D3A1F2C00D9 for ; Thu, 2 May 2013 15:17:35 +1000 (EST) Received: by mail-bk0-f49.google.com with SMTP id e19so84661bku.8 for ; Wed, 01 May 2013 22:17:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-received:date:message-id:subject:from:to:cc :content-type; bh=K4GZ0THSS6ZnnOgs1HowPYTPEVTkBf9Nc71Gaopm//w=; b=OeAFcwKvggtvqaUqg1xa58HRi17FGmhr5gV0/nap3ZEfEF9PvYW2X97QnUWVt19deJ wox3ggIsCs2plu9EaGwB1+Y7vC4GeGXMXpfJ3EdVw1YsamMVrULwgm+sBJ243k6GNeoQ cAhNjDERjb6Yfl4et3Ze0C2ryzmJrq03Gu2qmodl7rquyqjFQLFE76tZA0Y2rsvdUKvh h8bAK58azdNDeSJMx825Ct2I0oKMT3jwtloQF0u3ZyVPfw6OD7hv/DkQvUD22jKiMidC NefxXm4n0kTqcRfWw0mvviQpZUV512+6htw7Qhe7XVPrxTGjpksOHQ323td1uZhSZIL3 GV9Q== MIME-Version: 1.0 X-Received: by 10.204.62.137 with SMTP id x9mr1531569bkh.90.1367471851646; Wed, 01 May 2013 22:17:31 -0700 (PDT) Received: by 10.204.199.129 with HTTP; Wed, 1 May 2013 22:17:31 -0700 (PDT) Date: Thu, 2 May 2013 13:17:31 +0800 Message-ID: Subject: [PATCH -next] kvm/ppc/mpic: fix missing unlock in set_base_addr() From: Wei Yongjun To: mtosatti@redhat.com, gleb@redhat.com, agraf@suse.de, benh@kernel.crashing.org, paulus@samba.org, scottwood@freescale.com Cc: yongjun_wei@trendmicro.com.cn, linuxppc-dev@lists.ozlabs.org, kvm-ppc@vger.kernel.org, kvm@vger.kernel.org X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" From: Wei Yongjun Add the missing unlock before return from function set_base_addr() when disables the mapping. Introduced by commit 5df554ad5b7522ea62b0ff9d5be35183494efc21 (kvm/ppc/mpic: in-kernel MPIC emulation) Signed-off-by: Wei Yongjun --- arch/powerpc/kvm/mpic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/mpic.c b/arch/powerpc/kvm/mpic.c index f3148f8..0047a70 100644 --- a/arch/powerpc/kvm/mpic.c +++ b/arch/powerpc/kvm/mpic.c @@ -1475,8 +1475,8 @@ static int set_base_addr(struct openpic *opp, struct kvm_device_attr *attr) map_mmio(opp); - mutex_unlock(&opp->kvm->slots_lock); out: + mutex_unlock(&opp->kvm->slots_lock); return 0; }