Module Name: src
Committed By: nonaka
Date: Sat Feb 21 10:42:15 UTC 2015
Modified Files:
src/sys/dev/usb: if_athn_usb.c
Log Message:
pass collect size of firmware to firmware_free(9).
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/dev/usb/if_athn_usb.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/usb/if_athn_usb.c
diff -u src/sys/dev/usb/if_athn_usb.c:1.7 src/sys/dev/usb/if_athn_usb.c:1.8
--- src/sys/dev/usb/if_athn_usb.c:1.7 Wed Jan 7 07:05:48 2015
+++ src/sys/dev/usb/if_athn_usb.c Sat Feb 21 10:42:15 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: if_athn_usb.c,v 1.7 2015/01/07 07:05:48 ozaki-r Exp $ */
+/* $NetBSD: if_athn_usb.c,v 1.8 2015/02/21 10:42:15 nonaka Exp $ */
/* $OpenBSD: if_athn_usb.c,v 1.12 2013/01/14 09:50:31 jsing Exp $ */
/*-
@@ -22,7 +22,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.7 2015/01/07 07:05:48 ozaki-r Exp $");
+__KERNEL_RCSID(0, "$NetBSD: if_athn_usb.c,v 1.8 2015/02/21 10:42:15 nonaka Exp $");
#ifdef _KERNEL_OPT
#include "opt_inet.h"
@@ -795,7 +795,7 @@ athn_usb_load_firmware(struct athn_usb_s
usb_device_request_t req;
const char *name;
u_char *fw, *ptr;
- size_t size;
+ size_t size, remain;
uint32_t addr;
int s, mlen, error;
@@ -841,8 +841,9 @@ athn_usb_load_firmware(struct athn_usb_s
req.bmRequestType = UT_WRITE_VENDOR_DEVICE;
req.bRequest = AR_FW_DOWNLOAD;
USETW(req.wIndex, 0);
- while (size > 0) {
- mlen = MIN(size, 4096);
+ remain = size;
+ while (remain > 0) {
+ mlen = MIN(remain, 4096);
USETW(req.wValue, addr);
USETW(req.wLength, mlen);
@@ -851,9 +852,9 @@ athn_usb_load_firmware(struct athn_usb_s
firmware_free(fw, size);
return error;
}
- addr += mlen >> 8;
- ptr += mlen;
- size -= mlen;
+ addr += mlen >> 8;
+ ptr += mlen;
+ remain -= mlen;
}
firmware_free(fw, size);
