From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757481Ab3AYSuX (ORCPT ); Fri, 25 Jan 2013 13:50:23 -0500 Received: from h1446028.stratoserver.net ([85.214.92.142]:59139 "EHLO mail.ahsoftware.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756174Ab3AYSuQ (ORCPT ); Fri, 25 Jan 2013 13:50:16 -0500 From: Alexander Holler To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, Florian Tobias Schandinat , Bernie Thompson , Steve Glendinning , Alexander Holler , Subject: [PATCH 3/3] fb: smscufx: fix hang at disconnect Date: Fri, 25 Jan 2013 19:49:28 +0100 Message-Id: <1359139768-32294-3-git-send-email-holler@ahsoftware.de> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1359139768-32294-1-git-send-email-holler@ahsoftware.de> References: <50F2A310.5010006@ahsoftware.de> <1359139768-32294-1-git-send-email-holler@ahsoftware.de> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When a device was disconnected the driver may hang at waiting for urbs it never will get. Fix this by using a timeout while waiting for the used semaphore. There is still a memory leak if a timeout happens, but at least the driver now continues his disconnect routine. Cc: Signed-off-by: Alexander Holler --- drivers/video/smscufx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index 97bd662..f26fa4f 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c @@ -1838,8 +1838,9 @@ static void ufx_free_urb_list(struct ufx_data *dev) /* keep waiting and freeing, until we've got 'em all */ while (count--) { - /* Getting interrupted means a leak, but ok at shutdown*/ - ret = down_interruptible(&dev->urbs.limit_sem); + /* Timeout likely occurs at disconnect (resulting in a leak) */ + ret = down_timeout_killable(&dev->urbs.limit_sem, + FREE_URB_TIMEOUT); if (ret) break; -- 1.7.11.7 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alexander Holler Date: Fri, 25 Jan 2013 18:49:28 +0000 Subject: [PATCH 3/3] fb: smscufx: fix hang at disconnect Message-Id: <1359139768-32294-3-git-send-email-holler@ahsoftware.de> List-Id: References: <50F2A310.5010006@ahsoftware.de> <1359139768-32294-1-git-send-email-holler@ahsoftware.de> In-Reply-To: <1359139768-32294-1-git-send-email-holler@ahsoftware.de> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-kernel@vger.kernel.org Cc: linux-fbdev@vger.kernel.org, Florian Tobias Schandinat , Bernie Thompson , Steve Glendinning , Alexander Holler , stable@vger.kernel.org When a device was disconnected the driver may hang at waiting for urbs it never will get. Fix this by using a timeout while waiting for the used semaphore. There is still a memory leak if a timeout happens, but at least the driver now continues his disconnect routine. Cc: Signed-off-by: Alexander Holler --- drivers/video/smscufx.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/video/smscufx.c b/drivers/video/smscufx.c index 97bd662..f26fa4f 100644 --- a/drivers/video/smscufx.c +++ b/drivers/video/smscufx.c @@ -1838,8 +1838,9 @@ static void ufx_free_urb_list(struct ufx_data *dev) /* keep waiting and freeing, until we've got 'em all */ while (count--) { - /* Getting interrupted means a leak, but ok at shutdown*/ - ret = down_interruptible(&dev->urbs.limit_sem); + /* Timeout likely occurs at disconnect (resulting in a leak) */ + ret = down_timeout_killable(&dev->urbs.limit_sem, + FREE_URB_TIMEOUT); if (ret) break; -- 1.7.11.7