From 632ccd8963316f0804d6bbbb966ea15de34ae580 Mon Sep 17 00:00:00 2001 From: Javier Martinez Canillas Date: Sat, 12 Feb 2011 04:38:22 +0100 Subject: [PATCH] --- yaml --- r: 236031 b: refs/heads/master c: 1e1233234edeacabbcaab9d086474224ba5af015 h: refs/heads/master i: 236029: a9f1cfc10a613f236084eb08f8265a35e6d78a48 236027: ebb7e99ab7682a5b810bfe737738f98ebb91c0dc 236023: 3ab61522fc27530fe28ff0fe0c14d53b5a3b391d 236015: 59c06aa42fd9a8842eae07ffe0401986a465393c 235999: 4592490731c0cdf57afcfcc9626951430054db2a 235967: 10e4edc3864e9c22bfb4455431d9dfddf20700cc 235903: bac6e37beeb5347cc5b947bba97aa44e2e03728b 235775: ab075ac66fe230e2e4d40a2048c5ef60975a4cd2 235519: eacc39709b9d7d7c441553dea179a2b5b9ee7adc v: v3 --- [refs] | 2 +- trunk/drivers/staging/bcm/Bcmchar.c | 22 ++++++++++++---------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index a1e0423ef4fd..694e1a66ced8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ebb61e5f9754e88843fc05ee2a6204ef3f6c2fc8 +refs/heads/master: 1e1233234edeacabbcaab9d086474224ba5af015 diff --git a/trunk/drivers/staging/bcm/Bcmchar.c b/trunk/drivers/staging/bcm/Bcmchar.c index 7dff283edb65..edcd0c02eb85 100644 --- a/trunk/drivers/staging/bcm/Bcmchar.c +++ b/trunk/drivers/staging/bcm/Bcmchar.c @@ -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 */ @@ -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;