Patchwork [upstream,for,stable,3/8] staging: vt6656: 64bit fixes: dpc.c incorrect addressing of void structure.

login
register
mail settings
Submitter Malcolm Priestley
Date Dec. 27, 2012, 1:05 p.m.
Message ID <1356613515.3447.39.camel@canaries64>
Download mbox | patch
Permalink /patch/209019/
State New
Headers show

Comments

Malcolm Priestley - Dec. 27, 2012, 1:05 p.m.
upstream commit
eb304bddc47b59927b650d43c3f35b9266c807a9

Tested on kernels 2.6.35, 3.0, 3.2, 3.5 & 3.7

staging: vt6656: 64bit fixes: dpc.c incorrect addressing of void structure.
    
Fixes the deadlock on 64 bit.

Cc: stable@kernel.org  # 2.6.35+    
Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

Patch

diff --git a/drivers/staging/vt6656/dpc.c b/drivers/staging/vt6656/dpc.c
index 5ad7abb..e1b0881 100644
--- a/drivers/staging/vt6656/dpc.c
+++ b/drivers/staging/vt6656/dpc.c
@@ -1217,7 +1217,7 @@  static BOOL s_bHandleRxEncryption (
     if (byDecMode == KEY_CTL_WEP) {
         // handle WEP
         if ((pDevice->byLocalID <= REV_ID_VT3253_A1) ||
-            (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE)) {
+		(((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE)) {
             // Software WEP
             // 1. 3253A
             // 2. WEP 256
@@ -1324,9 +1324,9 @@  static BOOL s_bHostWepRxEncryption (
 
     if (byDecMode == KEY_CTL_WEP) {
         // handle WEP
-        DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP \n");
+	DBG_PRT(MSG_LEVEL_DEBUG, KERN_INFO"byDecMode == KEY_CTL_WEP\n");
         if ((pDevice->byLocalID <= REV_ID_VT3253_A1) ||
-            (((PSKeyTable)(pKey->pvKeyTable))->bSoftWEP == TRUE) ||
+		(((PSKeyTable)(&pKey->pvKeyTable))->bSoftWEP == TRUE) ||
             (bOnFly == FALSE)) {
             // Software WEP
             // 1. 3253A