From patchwork Sun Apr 1 15:53:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Steinar H. Gunderson" X-Patchwork-Id: 10526 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1SEN6s-0006qK-LR for patchwork@linuxtv.org; Sun, 01 Apr 2012 17:54:30 +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-2) with esmtp for id 1SEN6s-0003NT-GT; Sun, 01 Apr 2012 17:54:30 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752636Ab2DAPyW (ORCPT ); Sun, 1 Apr 2012 11:54:22 -0400 Received: from cassarossa.samfundet.no ([129.241.93.19]:40860 "EHLO cassarossa.samfundet.no" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752526Ab2DAPyF (ORCPT ); Sun, 1 Apr 2012 11:54:05 -0400 Received: from pannekake.samfundet.no ([2001:700:300:1800::dddd] ident=unknown) by cassarossa.samfundet.no with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.72) (envelope-from ) id 1SEN6R-0001VC-Mm; Sun, 01 Apr 2012 17:54:03 +0200 Received: from sesse by pannekake.samfundet.no with local (Exim 4.72) (envelope-from ) id 1SEN6R-0008Ng-EQ; Sun, 01 Apr 2012 17:54:03 +0200 From: "Steinar H. Gunderson" To: linux-media@vger.kernel.org Cc: "Steinar H. Gunderson" Subject: [PATCH 09/11] Correct wait_event_timeout error return check. Date: Sun, 1 Apr 2012 17:53:49 +0200 Message-Id: <1333295631-31866-9-git-send-email-sgunderson@bigfoot.com> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <20120401155330.GA31901@uio.no> References: <20120401155330.GA31901@uio.no> 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: 2012.4.1.154227 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1500_1599 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS ' From: "Steinar H. Gunderson" wait_event_timeout() returns 0 on timeout, not -ERESTARTSYS. Note that since this actually causes timeouts to be handled, it makes the CA situation a lot worse without the next patch in the series. --- drivers/media/dvb/mantis/mantis_hif.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c index 6d42f73..a3ec2a2 100644 --- a/drivers/media/dvb/mantis/mantis_hif.c +++ b/drivers/media/dvb/mantis/mantis_hif.c @@ -47,7 +47,7 @@ static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca) if (wait_event_timeout(ca->hif_opdone_wq, test_and_clear_bit(MANTIS_SBUF_OPDONE_BIT, &ca->hif_event), - msecs_to_jiffies(500)) == -ERESTARTSYS) { + msecs_to_jiffies(500)) == 0) { dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Smart buffer operation timeout !", mantis->num); rc = -EREMOTEIO; @@ -63,7 +63,7 @@ static int mantis_hif_write_wait(struct mantis_ca *ca) if (wait_event_timeout(ca->hif_write_wq, test_and_clear_bit(MANTIS_GPIF_WRACK_BIT, &mantis->gpif_status), - msecs_to_jiffies(500)) == -ERESTARTSYS) { + msecs_to_jiffies(500)) == 0) { dprintk(MANTIS_ERROR, 1, "Adapter(%d) Slot(0): Write ACK timed out !", mantis->num); rc = -EREMOTEIO;