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

Commit 4a90406b authored Nov 23, 2009 by Luciano Coelho Committed by John W. Linville Nov 28, 2009

wl1271: remove workaround to ignore -EIO from radio and general params



We were ignoring the -EIO return value from wl1271_cmd_radio_params() and
wl1271_cmd_general_params(), because they were always returning an error and
we didn't know why.  Now this has been fixed, so the workaround can be
removed.

Signed-off-by: Luciano Coelho <luciano.coelho@nokia.com>
Reviewed-by: Juuso Oikarinen <juuso.oikarinen@nokia.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

parent 98b5dd5d

drivers/net/wireless/wl12xx/wl1271_init.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -197,15 +197,12 @@ int wl1271_hw_init(struct wl1271 *wl)
		{
		int ret;

		/* FIXME: the following parameter setting functions return error
		* codes - the reason is so far unknown. The -EIO is therefore
		* ignored for the time being. */
		ret = wl1271_cmd_general_parms(wl);
		if (ret < 0 && ret != -EIO)
		if (ret < 0)
		return ret;

		ret = wl1271_cmd_radio_parms(wl);
		if (ret < 0 && ret != -EIO)
		if (ret < 0)
		return ret;

		/* Template settings */

drivers/net/wireless/wl12xx/wl1271_main.c

+2 −5

Original line number	Diff line number	Diff line
		@@ -354,15 +354,12 @@ static int wl1271_plt_init(struct wl1271 *wl)
		{
		int ret;

		/* FIXME: the following parameter setting functions return error
		* codes - the reason is so far unknown. The -EIO is therefore
		* ignored for the time being. */
		ret = wl1271_cmd_general_parms(wl);
		if (ret < 0 && ret != -EIO)
		if (ret < 0)
		return ret;

		ret = wl1271_cmd_radio_parms(wl);
		if (ret < 0 && ret != -EIO)
		if (ret < 0)
		return ret;

		ret = wl1271_acx_init_mem_config(wl);