From patchwork Thu Dec 27 13:07:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Malcolm Priestley X-Patchwork-Id: 209014 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 2DCD22C0086 for ; Wed, 2 Jan 2013 23:00:40 +1100 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1TqMzX-0001pQ-Bg; Wed, 02 Jan 2013 12:00:15 +0000 Received: from mail-bk0-f50.google.com ([209.85.214.50]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1ToDBe-0001WY-Gg for kernel-team@lists.ubuntu.com; Thu, 27 Dec 2012 13:07:50 +0000 Received: by mail-bk0-f50.google.com with SMTP id jf3so4287476bkc.37 for ; Thu, 27 Dec 2012 05:07:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:message-id:subject:from:to:cc:date:content-type:x-mailer :mime-version:content-transfer-encoding; bh=rm60EmrZhUubtPEt5DbLvIo5XfG5LlKjHKVL+I/rzMI=; b=iTrJ0vx+6f2PFEqxtBFxjJpmWacxzlMd/d/N+SImf7uXrUBhvaYfiRgYmNIb1p1Z8k QOfZq8U/OyrK72FEvodw08gkxYC3qrLv0oIUTuVER+2uVVkRUlwIiMgLZP4+sWZCnhw2 hr0ut7yAw+CDvnRKL7EG/ABxUgPKz4bEwFxaejvAciHaNz063TKljn+yEPgaDMn+YSmg kKKznIRo8q/IFefz0zaPHzVX7ai3TkW9SAA7hOEsXqaIWTUX0qOB/OIFgnTZVqca6wFm +W2C8KGHDxUHzbtz/9t07zICox66ijBEzlwSoWSaACR/Ykvuh86OrVYDdJOEOg31YC/a IEzg== X-Received: by 10.204.7.68 with SMTP id c4mr14508326bkc.109.1356613670215; Thu, 27 Dec 2012 05:07:50 -0800 (PST) Received: from [192.168.1.100] (94.196.41.202.threembb.co.uk. [94.196.41.202]) by mx.google.com with ESMTPS id i20sm20502155bkw.5.2012.12.27.05.07.45 (version=SSLv3 cipher=OTHER); Thu, 27 Dec 2012 05:07:47 -0800 (PST) Message-ID: <1356613661.3447.41.camel@canaries64> Subject: [PATCH upstream for stable 4/8]staging: vt6656: 64 bit fixes: use u32 for QWORD definition. From: Malcolm Priestley To: stable@vger.kernel.org Date: Thu, 27 Dec 2012 13:07:41 +0000 X-Mailer: Evolution 3.6.2-0ubuntu2 Mime-Version: 1.0 X-Mailman-Approved-At: Wed, 02 Jan 2013 12:00:07 +0000 Cc: kernel-team@lists.ubuntu.com X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 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 upstream commit a552397d5e4ef0cc0bd3e9595d6acc9a3b381171 Tested on kernels 2.6.35, 3.0, 3.2, 3.5 & 3.7 staging: vt6656: 64 bit fixes: use u32 for QWORD definition. Size of long issues replace with u32. Cc: stable@kernel.org # 2.6.35+ Signed-off-by: Malcolm Priestley Signed-off-by: Greg Kroah-Hartman diff --git a/drivers/staging/vt6656/ttype.h b/drivers/staging/vt6656/ttype.h index 8e9450e..0f70562c 100644 --- a/drivers/staging/vt6656/ttype.h +++ b/drivers/staging/vt6656/ttype.h @@ -29,6 +29,8 @@ #ifndef __TTYPE_H__ #define __TTYPE_H__ +#include + /******* Common definitions and typedefs ***********************************/ typedef int BOOL; @@ -51,8 +53,8 @@ typedef unsigned long DWORD; // 32-bit // which is NOT really a floating point number. typedef union tagUQuadWord { struct { - DWORD dwLowDword; - DWORD dwHighDword; + u32 dwLowDword; + u32 dwHighDword; } u; double DoNotUseThisField; } UQuadWord;