Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f826f55 authored by Luciano Coelho's avatar Luciano Coelho Committed by John W. Linville
Browse files

wl1271: wait for disconnect command complete event 



Wait for the DISCONNECT_EVENT_COMPLETE_ID event after sending a disconnect
command.

Signed-off-by: default avatarLuciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: default avatarJuuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 99d84c1d

drivers/net/wireless/wl12xx/wl1271_boot.c

+3 −2
Original line number Diff line number Diff line 
/*

 * This file is part of wl1271

 *

 * Copyright (C) 2008-2009 Nokia Corporation

 * Copyright (C) 2008-2010 Nokia Corporation

 *

 * Contact: Luciano Coelho <luciano.coelho@nokia.com>

 *
@@ -411,7 +411,8 @@ static int wl1271_boot_run_firmware(struct wl1271 *wl) 
	wl->event_mask = BSS_LOSE_EVENT_ID |

		SCAN_COMPLETE_EVENT_ID |

		PS_REPORT_EVENT_ID |

		JOIN_EVENT_COMPLETE_ID;

		JOIN_EVENT_COMPLETE_ID |

		DISCONNECT_EVENT_COMPLETE_ID;



	ret = wl1271_event_unmask(wl);

	if (ret < 0) {

drivers/net/wireless/wl12xx/wl1271_cmd.c

+5 −1
Original line number Diff line number Diff line 
/*

 * This file is part of wl1271

 *

 * Copyright (C) 2009 Nokia Corporation

 * Copyright (C) 2009-2010 Nokia Corporation

 *

 * Contact: Luciano Coelho <luciano.coelho@nokia.com>

 *
@@ -942,6 +942,10 @@ int wl1271_cmd_disconnect(struct wl1271 *wl) 
		goto out_free;

	}



	ret = wl1271_cmd_wait_for_event(wl, DISCONNECT_EVENT_COMPLETE_ID);

	if (ret < 0)

		wl1271_error("cmd disconnect event completion error");



out_free:

	kfree(cmd);