Merge remote-tracking branch 'remotes/aosp/android-3.0' into develop-3.0

[firefly-linux-kernel-4.4.55.git] / drivers / net / wireless / bcm4329 / dhd_sdio.c

diff --git a/drivers/net/wireless/bcm4329/dhd_sdio.c b/drivers/net/wireless/bcm4329/dhd_sdio.c
index 78dff1c489b8a8d31b82c122b14ca9c26f141a02..5459661c6a9b15e24c030dd2a38be9517fc29a5a 100644 (file)
--- a/drivers/net/wireless/bcm4329/dhd_sdio.c
+++ b/drivers/net/wireless/bcm4329/dhd_sdio.c
@@ -1282,7 +1282,8 @@ dhd_bus_txctl(struct dhd_bus *bus, uchar *msg, uint msglen)
                        DHD_INFO(("%s: ctrl_frame_stat == FALSE\n", __FUNCTION__));
                        ret = 0;
                } else {
-                       DHD_INFO(("%s: ctrl_frame_stat == TRUE\n", __FUNCTION__));
+                       if (!bus->dhd->hang_was_sent)
+                               DHD_ERROR(("%s: ctrl_frame_stat == TRUE\n", __FUNCTION__));
                        ret = -1;
                }
        }