projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'pm-core' and 'pm-domains'
[linux-2.6-block.git]
/
drivers
/
net
/
ethernet
/
toshiba
/
ps3_gelic_wireless.c
diff --git
a/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
b/drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
index 13214a6492ac5b1eced4d39c21b7736f5dcf19d4..743b18266a7c2b2be2b33f2d3f7fea0f9b80e361 100644
(file)
--- a/
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
+++ b/
drivers/net/ethernet/toshiba/ps3_gelic_wireless.c
@@
-1622,7
+1622,7
@@
static void gelic_wl_scan_complete_event(struct gelic_wl_info *wl)
continue;
/* copy hw scan info */
- memcpy(target->hwinfo, scan_info,
scan_info->size
);
+ memcpy(target->hwinfo, scan_info,
be16_to_cpu(scan_info->size)
);
target->essid_len = strnlen(scan_info->essid,
sizeof(scan_info->essid));
target->rate_len = 0;