From patchwork Fri Apr 16 17:25:45 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 50348 X-Patchwork-Delegate: apw@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 108D2B7D47 for ; Sat, 17 Apr 2010 03:25:57 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O2pId-00021s-GU; Fri, 16 Apr 2010 18:25:51 +0100 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1O2pIb-000219-A2 for kernel-team@lists.ubuntu.com; Fri, 16 Apr 2010 18:25:49 +0100 Received: from hutte.canonical.com ([91.189.90.181]) by adelie.canonical.com with esmtp (Exim 4.69 #1 (Debian)) id 1O2pIa-0006pY-6C; Fri, 16 Apr 2010 18:25:48 +0100 Received: from c-76-105-148-120.hsd1.or.comcast.net ([76.105.148.120] helo=[192.168.1.4]) by hutte.canonical.com with esmtpsa (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.69) (envelope-from ) id 1O2pIZ-0004r6-QN; Fri, 16 Apr 2010 18:25:48 +0100 Subject: Re: [Lucid] [Patch 3/3] SRU: Fix usbdux driver timeout and lockups From: Leann Ogasawara To: kernel-team In-Reply-To: <1271438420.30561.115.camel@emiko> References: <1271438420.30561.115.camel@emiko> Date: Fri, 16 Apr 2010 10:25:45 -0700 Message-ID: <1271438745.30561.126.camel@emiko> Mime-Version: 1.0 X-Mailer: Evolution 2.28.3 Cc: berndporr X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com >From 9fd5520c6803c77052a78f10ae1eb0bfe2358410 Mon Sep 17 00:00:00 2001 From: Bernd Porr Date: Fri, 27 Nov 2009 12:07:48 +0000 Subject: [PATCH 3/3] Staging: comedi: removed "depricated" from COMEDI_CB_BLOCK BugLink: http://bugs.launchpad.net/bugs/483343 The flag COMEDI_CB_BLOCK was marked as "depricated in the header file". However, this flag is important to wake up the data-reader (and writer) after new data has arrived from(for) the DAQ card. Signed-off-by: Bernd Porr Signed-off-by: Greg Kroah-Hartman (cherry picked from commit d103bef45180892515345e761f42db5601de9846 upstream) Signed-off-by: Leann Ogasawara Acked-by: Andy Whitcroft Acked-by: Colin King --- drivers/staging/comedi/comedi.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/drivers/staging/comedi/comedi.h b/drivers/staging/comedi/comedi.h index 957b640..fc36f2a 100644 --- a/drivers/staging/comedi/comedi.h +++ b/drivers/staging/comedi/comedi.h @@ -455,7 +455,7 @@ extern "C" { #define COMEDI_CB_EOS 1 /* end of scan */ #define COMEDI_CB_EOA 2 /* end of acquisition */ -#define COMEDI_CB_BLOCK 4 /* DEPRECATED: convenient block size */ +#define COMEDI_CB_BLOCK 4 /* data has arrived: wakes up read() / write() */ #define COMEDI_CB_EOBUF 8 /* DEPRECATED: end of buffer */ #define COMEDI_CB_ERROR 16 /* card error during acquisition */ #define COMEDI_CB_OVERFLOW 32 /* buffer overflow/underflow */