Merge android-4.4-p.203 (40ef73d) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / net / wireless / ath / ath10k / mac.c

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index 803ec58..924f7f2 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -958,7 +958,7 @@ static inline int ath10k_vdev_setup_sync(struct ath10k *ar)
        if (time_left == 0)
                return -ETIMEDOUT;
 
-       return 0;
+       return ar->last_wmi_vdev_start_status;
 }
 
 static int ath10k_monitor_vdev_start(struct ath10k *ar, int vdev_id)