On Thu, 2012-12-27 at 13:05 +0000, Malcolm Priestley wrote: > 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: [email protected] # 2.6.35+ > Signed-off-by: Malcolm Priestley <[email protected]> > Signed-off-by: Greg Kroah-Hartman <[email protected]> > > 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 > > >
This is broken in the same way as 2/8, commit e2efba763b472835fdface597fe2216b3403967e. Ben. -- Ben Hutchings The world is coming to an end. Please log off.
signature.asc
Description: This is a digitally signed message part
