diff options
| -rw-r--r-- | drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | 1 | ||||
| -rw-r--r-- | drivers/staging/hv/hv_utils.c | 3 | ||||
| -rw-r--r-- | drivers/staging/rt2860/common/cmm_aes.c | 2 | ||||
| -rw-r--r-- | drivers/staging/westbridge/astoria/api/src/cyasusb.c | 1 |
4 files changed, 0 insertions, 7 deletions
diff --git a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c index 87a6487531c2..20d509836d9e 100644 --- a/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c +++ b/drivers/staging/ft1000/ft1000-usb/ft1000_chdev.c | |||
| @@ -286,7 +286,6 @@ int ft1000_CreateDevice(struct ft1000_device *dev) | |||
| 286 | pid = kernel_thread (exec_mknod, (void *)info, 0); | 286 | pid = kernel_thread (exec_mknod, (void *)info, 0); |
| 287 | 287 | ||
| 288 | // initialize application information | 288 | // initialize application information |
| 289 | info->appcnt = 0; | ||
| 290 | 289 | ||
| 291 | // if (ft1000_flarion_cnt == 0) { | 290 | // if (ft1000_flarion_cnt == 0) { |
| 292 | // | 291 | // |
diff --git a/drivers/staging/hv/hv_utils.c b/drivers/staging/hv/hv_utils.c index 702a478d5542..a99e900ec4c9 100644 --- a/drivers/staging/hv/hv_utils.c +++ b/drivers/staging/hv/hv_utils.c | |||
| @@ -212,9 +212,6 @@ static void heartbeat_onchannelcallback(void *context) | |||
| 212 | recvlen, requestid); | 212 | recvlen, requestid); |
| 213 | 213 | ||
| 214 | icmsghdrp = (struct icmsg_hdr *)&buf[ | 214 | icmsghdrp = (struct icmsg_hdr *)&buf[ |
| 215 | sizeof(struct vmbuspipe_hdr)]; | ||
| 216 | |||
| 217 | icmsghdrp = (struct icmsg_hdr *)&buf[ | ||
| 218 | sizeof(struct vmbuspipe_hdr)]; | 215 | sizeof(struct vmbuspipe_hdr)]; |
| 219 | 216 | ||
| 220 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { | 217 | if (icmsghdrp->icmsgtype == ICMSGTYPE_NEGOTIATE) { |
diff --git a/drivers/staging/rt2860/common/cmm_aes.c b/drivers/staging/rt2860/common/cmm_aes.c index 1d159ff82fd2..a99879bada42 100644 --- a/drivers/staging/rt2860/common/cmm_aes.c +++ b/drivers/staging/rt2860/common/cmm_aes.c | |||
| @@ -330,8 +330,6 @@ void construct_mic_iv(unsigned char *mic_iv, | |||
| 330 | for (i = 8; i < 14; i++) | 330 | for (i = 8; i < 14; i++) |
| 331 | mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */ | 331 | mic_iv[i] = pn_vector[13 - i]; /* mic_iv[8:13] = PN[5:0] */ |
| 332 | #endif | 332 | #endif |
| 333 | i = (payload_length / 256); | ||
| 334 | i = (payload_length % 256); | ||
| 335 | mic_iv[14] = (unsigned char)(payload_length / 256); | 333 | mic_iv[14] = (unsigned char)(payload_length / 256); |
| 336 | mic_iv[15] = (unsigned char)(payload_length % 256); | 334 | mic_iv[15] = (unsigned char)(payload_length % 256); |
| 337 | 335 | ||
diff --git a/drivers/staging/westbridge/astoria/api/src/cyasusb.c b/drivers/staging/westbridge/astoria/api/src/cyasusb.c index 5a2197012065..7777d9a60a52 100644 --- a/drivers/staging/westbridge/astoria/api/src/cyasusb.c +++ b/drivers/staging/westbridge/astoria/api/src/cyasusb.c | |||
| @@ -1417,7 +1417,6 @@ cy_as_usb_set_enum_config(cy_as_device_handle handle, | |||
| 1417 | */ | 1417 | */ |
| 1418 | bus_mask = 0; | 1418 | bus_mask = 0; |
| 1419 | media_mask = 0; | 1419 | media_mask = 0; |
| 1420 | media_mask = 0; | ||
| 1421 | for (bus = 0; bus < CY_AS_MAX_BUSES; bus++) { | 1420 | for (bus = 0; bus < CY_AS_MAX_BUSES; bus++) { |
| 1422 | for (device = 0; device < CY_AS_MAX_STORAGE_DEVICES; device++) { | 1421 | for (device = 0; device < CY_AS_MAX_STORAGE_DEVICES; device++) { |
| 1423 | if (config_p->devices_to_enumerate[bus][device] == | 1422 | if (config_p->devices_to_enumerate[bus][device] == |
