From patchwork Mon Dec 28 16:59:46 2009
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Dan Carpenter <error27@gmail.com>
X-Patchwork-Id: 70019
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.2) with ESMTP id nBSH05Dw001771
	for <patchwork-media@patchwork.kernel.org>;
	Mon, 28 Dec 2009 17:00:05 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1752268AbZL1RAE (ORCPT
	<rfc822;patchwork-media@patchwork.kernel.org>);
	Mon, 28 Dec 2009 12:00:04 -0500
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752272AbZL1RAE
	(ORCPT <rfc822;linux-media-outgoing>);
	Mon, 28 Dec 2009 12:00:04 -0500
Received: from mail-fx0-f225.google.com ([209.85.220.225]:53972 "EHLO
	mail-fx0-f225.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1752259AbZL1RAB (ORCPT
	<rfc822;linux-media@vger.kernel.org>);
	Mon, 28 Dec 2009 12:00:01 -0500
Received: by fxm25 with SMTP id 25so4696309fxm.21
	for <linux-media@vger.kernel.org>;
	Mon, 28 Dec 2009 09:00:00 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma;
	h=domainkey-signature:received:received:date:from:to:cc:subject
	:message-id:mime-version:content-type:content-disposition:user-agent;
	bh=ppPJgdUg51c+f0uZkAHecFe3Ppzc+pOM59nG2mJKGoU=;
	b=QYyMZR6UOfq5dIk4oqBC2pAKQkRPHTdCXt1zBM9NNJ30xM04fhSnImN8fAyPLvIEFG
	8sc5BGgUM7GAgufZWVbeK1aa87vKWYvEVyIUaqQ7KdVxMXU7j/l87fGcUUAjfnplTMt4
	D/S+TqGm/LYONa/Y9xvbHK6/HmdIO3t6Kn+GA=
DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma;
	h=date:from:to:cc:subject:message-id:mime-version:content-type
	:content-disposition:user-agent;
	b=kwlif/BGQrftIzWpjrsvzOWnxKohPHAzugqUeg88cAMTQ8XVA3HNsNeQcyqJAPVIA0
	SENy8XjoDtVqvpHMXehITcd5nTRHDP4Ye1yQ5RB15WeFmBAgKFzJjAxqGdf8y/z5Nr3R
	VPEGfQXG0KI3kDvZ8fFmXqzdZZP85rNO3A3Z4=
Received: by 10.223.14.140 with SMTP id g12mr6881328faa.50.1262019600183;
	Mon, 28 Dec 2009 09:00:00 -0800 (PST)
Received: from bicker ([196.216.13.156])
	by mx.google.com with ESMTPS id 12sm17383281fks.9.2009.12.28.08.59.55
	(version=TLSv1/SSLv3 cipher=RC4-MD5);
	Mon, 28 Dec 2009 08:59:59 -0800 (PST)
Date: Mon, 28 Dec 2009 18:59:46 +0200
From: Dan Carpenter <error27@gmail.com>
To: linux-media@vger.kernel.org, devel@driverdev.osuosl.org
Cc: Greg Kroah-Hartman <gregkh@suse.de>
Subject: [patch] cx25821: fix double unlock in medusa_video_init()
Message-ID: <20091228165946.GD17645@bicker>
MIME-Version: 1.0
Content-Disposition: inline
User-Agent: Mutt/1.5.18 (2008-05-17)
Sender: linux-media-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-media.vger.kernel.org>
X-Mailing-List: linux-media@vger.kernel.org


--- orig/drivers/staging/cx25821/cx25821-medusa-video.c	2009-12-28 09:13:01.000000000 +0200
+++ devel/drivers/staging/cx25821/cx25821-medusa-video.c	2009-12-28 09:13:55.000000000 +0200
@@ -860,10 +860,8 @@ int medusa_video_init(struct cx25821_dev
 
 	ret_val = medusa_set_videostandard(dev);
 
-	if (ret_val < 0) {
-		mutex_unlock(&dev->lock);
+	if (ret_val < 0)
 		return -EINVAL;
-	}
 
 	return 1;
 }