diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-18 03:57:20 +0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-18 03:57:20 +0400 |
| commit | bb07b00be77fb33274cb44a03bdbf2471e556189 (patch) | |
| tree | 620390077de843dd7626998f0d8441d14a6c66d9 /drivers/net/wireless/ti/wl12xx/scan.c | |
| parent | b7165ebbf0898bad9aaeddfa22b918e94ed90e07 (diff) | |
| parent | 7d132055814ef17a6c7b69f342244c410a5e000f (diff) | |
| download | linux-bb07b00be77fb33274cb44a03bdbf2471e556189.tar.xz | |
Merge 3.10-rc6 into driver-core-next
We want these fixes here too.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/net/wireless/ti/wl12xx/scan.c')
| -rw-r--r-- | drivers/net/wireless/ti/wl12xx/scan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/ti/wl12xx/scan.c b/drivers/net/wireless/ti/wl12xx/scan.c index affdb3ec6225..4a0bbb13806b 100644 --- a/drivers/net/wireless/ti/wl12xx/scan.c +++ b/drivers/net/wireless/ti/wl12xx/scan.c @@ -310,7 +310,7 @@ static void wl12xx_adjust_channels(struct wl1271_cmd_sched_scan_config *cmd, memcpy(cmd->channels_2, cmd_channels->channels_2, sizeof(cmd->channels_2)); memcpy(cmd->channels_5, cmd_channels->channels_5, - sizeof(cmd->channels_2)); + sizeof(cmd->channels_5)); /* channels_4 are not supported, so no need to copy them */ } |