Commit fe0dbcc9 authored Aug 13, 2010 by Yuri Kululin Committed by John W. Linville Aug 13, 2010

wl1251: fix trigger scan timeout usage

Use appropriate command (CMD_TRIGGER_SCAN_TO) instead of scan command
(CMD_SCAN) to configure trigger scan timeout.

This was broken in commit 3a98c30f.

This fix address the bug reported here:

https://bugzilla.kernel.org/show_bug.cgi?id=16554



Cc: stable@kernel.org
Signed-off-by: Yuri Ershov <ext-yuri.ershov@nokia.com>
Signed-off-by: Yuri Kululin <ext-yuri.kululin@nokia.com>
Acked-by: Kalle Valo <kvalo@adurom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 71ba186c

drivers/net/wireless/wl12xx/wl1251_cmd.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -484,7 +484,7 @@ int wl1251_cmd_trigger_scan_to(struct wl1251 *wl, u32 timeout)

		cmd->timeout = timeout;

		ret = wl1251_cmd_send(wl, CMD_SCAN, cmd, sizeof(*cmd));
		ret = wl1251_cmd_send(wl, CMD_TRIGGER_SCAN_TO, cmd, sizeof(*cmd));
		if (ret < 0) {
		wl1251_error("cmd trigger scan to failed: %d", ret);
		goto out;