From: John W. Linville <linville@tuxdriver.com>
Date: Tue, 27 Oct 2009 19:15:05 +0000 (-0400)
Subject: wl1251: re-disable PG10 chips
X-Git-Tag: MMI-PSA29.97-13-9~25754^2~599^2~50
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a493e8f4d78fc3f2494fa952500b720c86737d8;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

wl1251: re-disable PG10 chips

"wl1251: add support for PG11 chips." accidentally enabled PG10 chips as
well...

Reported-by: Kalle Valo <kalle.valo@iki.fi>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

diff --git a/drivers/net/wireless/wl12xx/wl1251_main.c b/drivers/net/wireless/wl12xx/wl1251_main.c
index ec01e9dadb0d..48b0bfd6c55a 100644
--- a/drivers/net/wireless/wl12xx/wl1251_main.c
+++ b/drivers/net/wireless/wl12xx/wl1251_main.c
@@ -183,11 +183,11 @@ static int wl1251_chip_wakeup(struct wl1251 *wl)
 		wl1251_debug(DEBUG_BOOT, "chip id 0x%x (1251 PG12)",
 			     wl->chip_id);
 		break;
-	case CHIP_ID_1251_PG10:
 	case CHIP_ID_1251_PG11:
 		wl1251_debug(DEBUG_BOOT, "chip id 0x%x (1251 PG11)",
 			     wl->chip_id);
 		break;
+	case CHIP_ID_1251_PG10:
 	default:
 		wl1251_error("unsupported chip id: 0x%x", wl->chip_id);
 		ret = -ENODEV;