diff options
author | Javier Martinez Canillas <martinez.javier@gmail.com> | 2011-02-11 22:38:24 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-02-18 16:21:56 -0500 |
commit | 7227ba06479f981f5cf9977a7eeb3a20d30dc501 (patch) | |
tree | 04855815a88e4900645a6ec260a88d12180794f1 /drivers/staging/bcm | |
parent | a7d3976edc32e6041f9d68c79ba64a17d5ec5095 (diff) |
Staging: bcm: Bcmchar: Fix style issues on bcm_char_read()
Signed-off-by: Javier Martinez Canillas <martinez.javier@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/bcm')
-rw-r--r-- | drivers/staging/bcm/Bcmchar.c | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/drivers/staging/bcm/Bcmchar.c b/drivers/staging/bcm/Bcmchar.c index 2a3f64ccefe..2064c2e901c 100644 --- a/drivers/staging/bcm/Bcmchar.c +++ b/drivers/staging/bcm/Bcmchar.c | |||
@@ -96,59 +96,63 @@ static int bcm_char_release(struct inode *inode, struct file *filp) | |||
96 | return 0; | 96 | return 0; |
97 | } | 97 | } |
98 | 98 | ||
99 | static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, loff_t *f_pos) | 99 | static ssize_t bcm_char_read(struct file *filp, char __user *buf, size_t size, |
100 | loff_t *f_pos) | ||
100 | { | 101 | { |
101 | PPER_TARANG_DATA pTarang = filp->private_data; | 102 | PPER_TARANG_DATA pTarang = filp->private_data; |
102 | PMINI_ADAPTER Adapter = pTarang->Adapter; | 103 | PMINI_ADAPTER Adapter = pTarang->Adapter; |
103 | struct sk_buff* Packet = NULL; | 104 | struct sk_buff *Packet = NULL; |
104 | ssize_t PktLen = 0; | 105 | ssize_t PktLen = 0; |
105 | int wait_ret_val=0; | 106 | int wait_ret_val = 0; |
107 | unsigned long ret = 0; | ||
106 | 108 | ||
107 | wait_ret_val = wait_event_interruptible(Adapter->process_read_wait_queue, | 109 | wait_ret_val = wait_event_interruptible(Adapter->process_read_wait_queue, |
108 | (pTarang->RxAppControlHead || Adapter->device_removed)); | 110 | (pTarang->RxAppControlHead || |
109 | if((wait_ret_val == -ERESTARTSYS)) | 111 | Adapter->device_removed)); |
110 | { | 112 | if ((wait_ret_val == -ERESTARTSYS)) { |
111 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Exiting as i've been asked to exit!!!\n"); | 113 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, |
114 | "Exiting as i've been asked to exit!!!\n"); | ||
112 | return wait_ret_val; | 115 | return wait_ret_val; |
113 | } | 116 | } |
114 | 117 | ||
115 | if(Adapter->device_removed) | 118 | if (Adapter->device_removed) { |
116 | { | 119 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, |
117 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "Device Removed... Killing the Apps...\n"); | 120 | "Device Removed... Killing the Apps...\n"); |
118 | return -ENODEV; | 121 | return -ENODEV; |
119 | } | 122 | } |
120 | 123 | ||
121 | if(FALSE == Adapter->fw_download_done) | 124 | if (FALSE == Adapter->fw_download_done) |
122 | return -EACCES; | 125 | return -EACCES; |
123 | 126 | ||
124 | down( &Adapter->RxAppControlQueuelock); | 127 | down(&Adapter->RxAppControlQueuelock); |
125 | 128 | ||
126 | if(pTarang->RxAppControlHead) | 129 | if (pTarang->RxAppControlHead) { |
127 | { | ||
128 | Packet = pTarang->RxAppControlHead; | 130 | Packet = pTarang->RxAppControlHead; |
129 | DEQUEUEPACKET(pTarang->RxAppControlHead,pTarang->RxAppControlTail); | 131 | DEQUEUEPACKET(pTarang->RxAppControlHead, |
132 | pTarang->RxAppControlTail); | ||
130 | pTarang->AppCtrlQueueLen--; | 133 | pTarang->AppCtrlQueueLen--; |
131 | } | 134 | } |
132 | 135 | ||
133 | up(&Adapter->RxAppControlQueuelock); | 136 | up(&Adapter->RxAppControlQueuelock); |
134 | 137 | ||
135 | if(Packet) | 138 | if (Packet) { |
136 | { | ||
137 | PktLen = Packet->len; | 139 | PktLen = Packet->len; |
138 | if(copy_to_user(buf, Packet->data, min_t(size_t, PktLen, size))) | 140 | ret = copy_to_user(buf, Packet->data, |
139 | { | 141 | min_t(size_t, PktLen, size)); |
142 | if (ret) { | ||
140 | dev_kfree_skb(Packet); | 143 | dev_kfree_skb(Packet); |
141 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_PRINTK, 0, 0, "\nReturning from copy to user failure \n"); | 144 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_PRINTK, 0, 0, |
145 | "Returning from copy to user failure\n"); | ||
142 | return -EFAULT; | 146 | return -EFAULT; |
143 | } | 147 | } |
144 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, | 148 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, |
145 | "Read %zd Bytes From Adapter packet = %p by process %d!\n", | 149 | "Read %zd Bytes From Adapter packet = %p by process %d!\n", |
146 | PktLen, Packet, current->pid); | 150 | PktLen, Packet, current->pid); |
147 | dev_kfree_skb(Packet); | 151 | dev_kfree_skb(Packet); |
148 | } | 152 | } |
149 | 153 | ||
150 | BCM_DEBUG_PRINT(Adapter,DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<====\n"); | 154 | BCM_DEBUG_PRINT(Adapter, DBG_TYPE_OTHERS, OSAL_DBG, DBG_LVL_ALL, "<\n"); |
151 | return PktLen; | 155 | return PktLen; |
152 | } | 156 | } |
153 | 157 | ||
154 | static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) | 158 | static long bcm_char_ioctl(struct file *filp, UINT cmd, ULONG arg) |