From patchwork Fri Dec 20 20:21:03 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kamal Mostafa X-Patchwork-Id: 304259 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 1675F2C00BC for ; Sat, 21 Dec 2013 07:21:19 +1100 (EST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vu6ZP-0001O7-Ah; Fri, 20 Dec 2013 20:21:15 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Vu6ZG-0001KW-WF for kernel-team@lists.ubuntu.com; Fri, 20 Dec 2013 20:21:07 +0000 Received: from c-67-160-231-162.hsd1.ca.comcast.net ([67.160.231.162] helo=fourier) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1Vu6ZF-0007zp-Vo; Fri, 20 Dec 2013 20:21:06 +0000 Received: from kamal by fourier with local (Exim 4.80) (envelope-from ) id 1Vu6ZD-0004uX-Ld; Fri, 20 Dec 2013 12:21:03 -0800 From: Kamal Mostafa To: Ian Abbott Subject: [3.8.y.z extended stable] Patch "staging: comedi: amplc_pc263: correct insn_bits result" has been added to staging queue Date: Fri, 20 Dec 2013 12:21:03 -0800 Message-Id: <1387570863-18847-1-git-send-email-kamal@canonical.com> X-Mailer: git-send-email 1.8.3.2 X-Extended-Stable: 3.8 Cc: Kamal Mostafa , kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: kernel-team-bounces@lists.ubuntu.com This is a note to let you know that I have just added a patch titled staging: comedi: amplc_pc263: correct insn_bits result to the linux-3.8.y-queue branch of the 3.8.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.8.y-queue This patch is scheduled to be released in version 3.8.13.15. If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.8.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Kamal ------ From 88e0c15fdcebb4f6a70c26e9f84abadb29aef888 Mon Sep 17 00:00:00 2001 From: Ian Abbott Date: Thu, 12 Dec 2013 12:10:32 +0000 Subject: staging: comedi: amplc_pc263: correct insn_bits result commit 97f4289ad08cffe55de06d4ac4f89ac540450aee upstream. [Split from original patch subject: "staging: comedi: drivers: use comedi_dio_update_state() for simple cases"] Also, fix a bug in the amplc_pc263 and amplc_pci263 drivers where the current state is not returned in data[1]. Signed-off-by: Ian Abbott Signed-off-by: Kamal Mostafa --- drivers/staging/comedi/drivers/amplc_pc263.c | 3 +++ 1 file changed, 3 insertions(+) -- 1.8.3.2 diff --git a/drivers/staging/comedi/drivers/amplc_pc263.c b/drivers/staging/comedi/drivers/amplc_pc263.c index dfbff77..53b2ad9 100644 --- a/drivers/staging/comedi/drivers/amplc_pc263.c +++ b/drivers/staging/comedi/drivers/amplc_pc263.c @@ -192,6 +192,9 @@ static int pc263_do_insn_bits(struct comedi_device *dev, outb(s->state & 0xFF, dev->iobase); outb(s->state >> 8, dev->iobase + 1); } + + data[1] = s->state; + return insn->n; }