diff --git a/[refs] b/[refs] index 5762e9370944..f9ec6656eba3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b44350b495a6ec94f59073c5a4e09e80a818304 +refs/heads/master: 51c4ed95a857ded6017537fd53fa00db64908954 diff --git a/trunk/drivers/net/wireless/wl12xx/main.c b/trunk/drivers/net/wireless/wl12xx/main.c index fc8dfbfe1d89..adf9bbcf88fd 100644 --- a/trunk/drivers/net/wireless/wl12xx/main.c +++ b/trunk/drivers/net/wireless/wl12xx/main.c @@ -680,8 +680,6 @@ static int wl1271_plt_init(struct wl1271 *wl) if (ret < 0) return ret; } - if (ret < 0) - return ret; /* Chip-specific initializations */ ret = wl1271_chip_specific_init(wl);