From patchwork Thu May 27 20:16:29 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Ringel X-Patchwork-Id: 102771 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4RKIRlU025444 for ; Thu, 27 May 2010 20:18:27 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758772Ab0E0USZ (ORCPT ); Thu, 27 May 2010 16:18:25 -0400 Received: from mail-in-04.arcor-online.net ([151.189.21.44]:58060 "EHLO mail-in-04.arcor-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758734Ab0E0USZ (ORCPT ); Thu, 27 May 2010 16:18:25 -0400 Received: from mail-in-03-z2.arcor-online.net (mail-in-03-z2.arcor-online.net [151.189.8.15]) by mx.arcor.de (Postfix) with ESMTP id DD400AA0E5; Thu, 27 May 2010 22:18:22 +0200 (CEST) Received: from mail-in-09.arcor-online.net (mail-in-09.arcor-online.net [151.189.21.49]) by mail-in-03-z2.arcor-online.net (Postfix) with ESMTP id D1B6E9DDF9; Thu, 27 May 2010 22:18:22 +0200 (CEST) Received: from localhost.localdomain (dslb-188-103-206-005.pools.arcor-ip.net [188.103.206.5]) (Authenticated sender: stefan.ringel@arcor.de) by mail-in-09.arcor-online.net (Postfix) with ESMTPA id 36C521977D1; Thu, 27 May 2010 22:18:21 +0200 (CEST) X-DKIM: Sendmail DKIM Filter v2.8.2 mail-in-09.arcor-online.net 36C521977D1 DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arcor.de; s=mail-in; t=1274991502; bh=yvUmsBnO1JhvKoRXbaLR1Q06WZLWsqIfP+se1UNkSd4=; h=From:To:Cc:Subject:Date:Message-Id; b=lXLfqrhqJmA0DpfrEHQqr55FSrITFLf1xi7ZTD1EDGtybgVX9Cd7NLaVxzP+Kf8UB 6u5EZpu5/xaQ8IllC5EOWGQPWHvDP4hjjUThplWInKf6aSvABJchr1A7g3CZuWRUbT toQPLTj59fJnyLj8aM60pDyy4DktKf4HcL4eLelg= From: stefan.ringel@arcor.de To: linux-media@vger.kernel.org Cc: mchehab@redhat.com, d.belimov@gmail.com, Stefan Ringel Subject: [PATCH] tm6000: bugfix outp in function copy_multiplexed Date: Thu, 27 May 2010 22:16:29 +0200 Message-Id: <1274991389-6439-1-git-send-email-stefan.ringel@arcor.de> X-Mailer: git-send-email 1.7.0.3 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 27 May 2010 20:18:27 +0000 (UTC) diff --git a/drivers/staging/tm6000/tm6000-video.c b/drivers/staging/tm6000/tm6000-video.c index 31c574f..96cbbf7 100644 --- a/drivers/staging/tm6000/tm6000-video.c +++ b/drivers/staging/tm6000/tm6000-video.c @@ -358,7 +358,7 @@ static int copy_multiplexed(u8 *ptr, unsigned long len, while (len>0) { cpysize=min(len,buf->vb.size-pos); //printk("Copying %d bytes (max=%lu) from %p to %p[%u]\n",cpysize,(*buf)->vb.size,ptr,out_p,pos); - memcpy(&out_p[pos], ptr, cpysize); + memcpy(&outp[pos], ptr, cpysize); pos+=cpysize; ptr+=cpysize; len-=cpysize; @@ -370,8 +370,8 @@ static int copy_multiplexed(u8 *ptr, unsigned long len, get_next_buf (dma_q, &buf); if (!buf) break; - out_p = videobuf_to_vmalloc(&(buf->vb)); - if (!out_p) + outp = videobuf_to_vmalloc(&(buf->vb)); + if (!outp) return rc; pos = 0; }