From patchwork Sat Sep 24 20:42:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Rankin X-Patchwork-Id: 7945 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1R7Z3U-0008Uk-HD; Sat, 24 Sep 2011 22:43:00 +0200 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.75/mailfrontend-1) with esmtp id 1R7Z3T-0000l9-Ln; Sat, 24 Sep 2011 22:42:36 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751685Ab1IXUm2 (ORCPT + 5 others); Sat, 24 Sep 2011 16:42:28 -0400 Received: from nm3.bt.bullet.mail.ukl.yahoo.com ([217.146.183.201]:37551 "HELO nm3.bt.bullet.mail.ukl.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1751295Ab1IXUm1 (ORCPT ); Sat, 24 Sep 2011 16:42:27 -0400 Received: from [217.146.183.195] by nm3.bt.bullet.mail.ukl.yahoo.com with NNFMP; 24 Sep 2011 20:42:26 -0000 Received: from [217.146.183.205] by tm1.bt.bullet.mail.ukl.yahoo.com with NNFMP; 24 Sep 2011 20:42:26 -0000 Received: from [127.0.0.1] by omp1003.bt.mail.ukl.yahoo.com with NNFMP; 24 Sep 2011 20:42:26 -0000 X-Yahoo-Newman-Id: 310707.43925.bm@omp1003.bt.mail.ukl.yahoo.com Received: (qmail 34573 invoked from network); 24 Sep 2011 20:42:26 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=s1024; d=yahoo.com; h=DKIM-Signature:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type; b=QcqpMnXG3axduUuHwrDMJubQTPqdmfr9TdkUniIAAC7Br44XKfg+3fzVRp7Ze1fx2m59jIsPX+q9T2B/ocVi7u5yBOXj7bKamu9bhgCVr2Q+E5XFW2uPl4msdQKVZPlrDCCUpxwwtoIRMapMPMCn4PqIhIPvu/zbR0bIbodhbDs= ; DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s1024; t=1316896946; bh=EhKRFSCW1UvZD+gW0qxS1HQjOAr1RuWh0b8s2TT5Oe8=; h=X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:Received:Message-ID:Date:From:User-Agent:MIME-Version:To:CC:Subject:Content-Type; b=n1afWYEbRuSR5Eisys3S6snQCmuz4cI4H5UStGb/nsXdpG+9sT1rBUCcLlnGwc0+tSwINy+MuGg6/WnL7ykccBLRul6/h+dabEcUVrj/r/m+4UY6pwKH2WujIHFRohVGgQYgUfNKswxTF88LyMYqdVGj8GSIYvZN+4Oig4nEOD8= X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: zRdzr1UVM1lBI1yp9pTMfOPBH3N1bQk28_.qOy4liEHEj4E _HrSG1D_cD.P3S77B_5lAOOysRTEJbas3Pc65O4I3oHvOU12PNJyXZXSI_RH Ry_wV6eRYrDyk80l1t9ZY1BuzE0lpoC3Xz.KfWG76RCPs_MF3JEx09BCXr_N yyc7_HtIaKc9.7bT2Cfry8KafY9diDjILSnA3YAbasPhE7.OnE_O62gevHUf 2Sd4AoyOpNCBurmsJUTasKVh5HAsEO5YXcem37LiZNCr0Bs6uvmDow__SsYE 2MDvvG9TyyYtWsSWPIKzVqh1bxwmQFYL0Qj8wk5h62b7dyD_wnjUaTRKwfVq zjrDJ1hsDHgXWSdXVi8LfCeBzQzEnkh40OqkjcGt04ysgQDaylV4uCV0gOuG iKzsy X-Yahoo-SMTP: dMK34oyswBBlfKesWTI5ovDjFOUFE6shtILt.ZXnUEjQHhWq Received: from wellhouse.underworld (rankincj@86.178.153.128 with login) by smtp816.mail.ukl.yahoo.com with SMTP; 24 Sep 2011 20:42:25 +0000 GMT Received: from volcano.underworld (volcano.underworld [192.168.0.3]) by wellhouse.underworld (8.14.3/8.14.3/Debian-5+lenny1) with ESMTP id p8OKgMLS027504 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NOT); Sat, 24 Sep 2011 21:42:24 +0100 Message-ID: <4E7E40AD.5060206@yahoo.com> Date: Sat, 24 Sep 2011 21:42:21 +0100 From: Chris Rankin User-Agent: Mozilla/5.0 (X11; Linux i686; rv:6.0.2) Gecko/20110906 Thunderbird/6.0.2 MIME-Version: 1.0 To: Michael Hughes CC: linux-media@vger.kernel.org Subject: [PATCH v2] EM28xx - fix deadlock when unplugging and replugging a DVB adapter Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-PMX-Version: 5.6.1.2065439, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.9.24.203314 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' FORGED_FROM_YAHOO 0.1, MIME_TEXT_ONLY_MP_MIXED 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1900_1999 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, ECARD_KNOWN_DOMAINS 0, __ANY_URI 0, __BAT_BOUNDARY 0, __CP_URI_IN_BODY 0, __CT 0, __CTYPE_HAS_BOUNDARY 0, __CTYPE_MULTIPART 0, __CTYPE_MULTIPART_MIXED 0, __DOMAINKEYS_YAHOO 0, __FRAUD_BODY_WEBMAIL 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_YAHOO 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MOZILLA_MSGID 0, __PHISH_SPEAR_STRUCTURE_1 0, __SANE_MSGID 0, __SUBJ_ALPHA_END 0, __TO_MALFORMED_2 0, __URI_NO_WWW 0, __URI_NS , __USER_AGENT 0' X-LSpam-Score: 1.1 (+) X-LSpam-Report: No, score=1.1 required=5.0 tests=BAYES_00=-1.9, FREEMAIL_FROM=0.001, KB_DATE_CONTAINS_TAB=2.751, RCVD_IN_DNSWL_MED=-2.3, TAB_IN_FROM=2.494, T_DKIM_INVALID=0.01, T_TVD_MIME_EPI=0.01, UNPARSEABLE_RELAY=0.001 autolearn=no Mauro, Pending the complete rethink about how USB devices manage their resources, I am resubmitting my fix for the PCTV 290e deadlock that occurs with either multiple adapters or when an adapter is replugged. For DVB devices, the device lock must now *not* be held when adding/removing either a device or an extension to the respective lists. (Because em28xx_init_dvb() will want to take the lock instead). Conversely, for Audio-Only devices, the device lock *must* be held when adding/removing either a device or an extension to the respective lists. Signed-off-by: Chris Rankin Cheers, Chris --- linux/drivers/media/video/em28xx/em28xx-cards.c.orig 2011-09-24 21:25:01.000000000 +0100 +++ linux/drivers/media/video/em28xx/em28xx-cards.c 2011-09-24 21:37:42.000000000 +0100 @@ -3005,9 +3005,7 @@ goto fail; } - mutex_unlock(&dev->lock); em28xx_init_extension(dev); - mutex_lock(&dev->lock); /* Save some power by putting tuner to sleep */ v4l2_device_call_all(&dev->v4l2_dev, 0, core, s_power, 0); @@ -3303,10 +3301,10 @@ em28xx_release_resources(dev); } - mutex_unlock(&dev->lock); - em28xx_close_extension(dev); + mutex_unlock(&dev->lock); + if (!dev->users) { kfree(dev->alt_max_pkt_size); kfree(dev);