diff options
| author | Ecco Park <eccopark@broadcom.com> | 2013-09-30 15:09:47 -0700 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2016-05-01 23:35:28 +0200 |
| commit | 3acf792e09e0d195b51915456964283bbdeb4347 (patch) | |
| tree | 4ee13b3faec986bff2f885d0a37daf31fcc32df9 /drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | |
| parent | d3a4cc7eea274fd7fbec3ba86eff920a42c77803 (diff) | |
| download | kernel_samsung_tuna-3acf792e09e0d195b51915456964283bbdeb4347.zip kernel_samsung_tuna-3acf792e09e0d195b51915456964283bbdeb4347.tar.gz kernel_samsung_tuna-3acf792e09e0d195b51915456964283bbdeb4347.tar.bz2 | |
net: wireless: bcmdhd: fix for negative padding
Signed-off-by: Iliyan Malchev <malchev@google.com>
Diffstat (limited to 'drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c')
| -rw-r--r-- | drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c index 0c0f906..96e88f4 100644 --- a/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c +++ b/drivers/net/wireless/bcmdhd/bcmsdh_sdmmc.c @@ -1184,7 +1184,7 @@ sdioh_request_packet(sdioh_info_t *sd, uint fix_inc, uint write, uint func, for (pnext = pkt; pnext; pnext = PKTNEXT(sd->osh, pnext)) { uint8 *buf = (uint8*)PKTDATA(sd->osh, pnext) + xfred_len; - uint pad = 0; + int pad = 0; pkt_len = PKTLEN(sd->osh, pnext); if (0 != xfred_len) { pkt_len -= xfred_len; @@ -1231,11 +1231,11 @@ txglomfail: !need_txglom && #endif TRUE) { - pkt_len = sdioh_request_packet_align(pkt_len, write, + int align_pkt_len = 0; + align_pkt_len = sdioh_request_packet_align(pkt_len, write, func, blk_size); - pad = pkt_len - PKTLEN(sd->osh, pnext); - + pad = align_pkt_len - pkt_len; if (pad > 0) { if (func == SDIO_FUNC_2) { sd_err(("%s: padding is unexpected! pkt_len %d," |