From: Mauro Carvalho Chehab Date: Wed, 5 May 2010 15:30:01 +0000 (-0300) Subject: V4L/DVB: Fix unlock logic at medusa_video_init X-Git-Tag: v2.6.35-rc1~480^2~5 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64561a38838c66de1af059e7f4c14bbaa7dd3d54;p=pandora-kernel.git V4L/DVB: Fix unlock logic at medusa_video_init As reported by Dan Carpenter: > This was my patch: "cx25821: fix double unlock in medusa_video_init()" > > It accidentally got merged two times. The version from the staging tree > is not correct. Please can you revert it: > 7a02f549fcc30fe6be0c0024beae9a3db22e1af6 "Staging: cx25821: fix double > unlock in medusa_video_init()" After reviewing the logic at the function, instead of just adding a patch to revert the wrong one, the better is to apply a different logic: add a goto that will always unlock and return the error. This simplifies the code a little bit, and, instead of just return -EINVAL, it will return the error condition reported by the called functions. This patch is folded with another patch from Dan that added one missing goto. Signed-off-by: Dan Carpenter Signed-off-by: Mauro Carvalho Chehab --- Reading git-diff-tree failed