Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 236031
b: refs/heads/master
c: 1e12332
h: refs/heads/master
i:
  236029: a9f1cfc
  236027: ebb7e99
  236023: 3ab6152
  236015: 59c06aa
  235999: 4592490
  235967: 10e4edc
  235903: bac6e37
  235775: ab075ac
  235519: eacc397
v: v3
  • Loading branch information
Javier Martinez Canillas authored and Greg Kroah-Hartman committed Feb 18, 2011
1 parent 76f2be0 commit 632ccd8
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ebb61e5f9754e88843fc05ee2a6204ef3f6c2fc8
refs/heads/master: 1e1233234edeacabbcaab9d086474224ba5af015
22 changes: 12 additions & 10 deletions trunk/drivers/staging/bcm/Bcmchar.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,21 +15,22 @@

static int bcm_char_open(struct inode *inode, struct file * filp)
{
PMINI_ADAPTER Adapter = NULL;
PPER_TARANG_DATA pTarang = NULL;
PMINI_ADAPTER Adapter = NULL;
PPER_TARANG_DATA pTarang = NULL;

Adapter = GET_BCM_ADAPTER(gblpnetdev);
pTarang = (PPER_TARANG_DATA)kmalloc(sizeof(PER_TARANG_DATA), GFP_KERNEL);
if (!pTarang)
return -ENOMEM;
pTarang = (PPER_TARANG_DATA)kmalloc(sizeof(PER_TARANG_DATA),
GFP_KERNEL);
if (!pTarang)
return -ENOMEM;

memset (pTarang, 0, sizeof(PER_TARANG_DATA));
pTarang->Adapter = Adapter;
pTarang->RxCntrlMsgBitMask = 0xFFFFFFFF & ~(1 << 0xB) ;
memset(pTarang, 0, sizeof(PER_TARANG_DATA));
pTarang->Adapter = Adapter;
pTarang->RxCntrlMsgBitMask = 0xFFFFFFFF & ~(1 << 0xB);

down(&Adapter->RxAppControlQueuelock);
pTarang->next = Adapter->pTarangs;
Adapter->pTarangs = pTarang;
pTarang->next = Adapter->pTarangs;
Adapter->pTarangs = pTarang;
up(&Adapter->RxAppControlQueuelock);

/* Store the Adapter structure */
Expand All @@ -41,6 +42,7 @@ static int bcm_char_open(struct inode *inode, struct file * filp)
nonseekable_open(inode, filp);
return 0;
}

static int bcm_char_release(struct inode *inode, struct file *filp)
{
PPER_TARANG_DATA pTarang, tmp, ptmp;
Expand Down

0 comments on commit 632ccd8

Please sign in to comment.