Author: ivadasz
Date: Mon Sep 19 22:13:08 2016
New Revision: 306002
URL: https://svnweb.freebsd.org/changeset/base/306002

Log:
  [iwm] Fix iwm_poll_bit() error value check in iwm_attach().
  
  The iwm(4) iwm_poll_bit() function returns 1 on success, and 0 on failure,
  whereas the iwl_poll_bit() in Linux iwlwifi returns < 0 on failure.
  
  So the (ret < 0) check ended up ignoring any error returned by
  iwm_poll_bit().
  
  Approved by:  adrian (mentor)
  Differential Revision:        https://reviews.freebsd.org/D7932

Modified:
  head/sys/dev/iwm/if_iwm.c

Modified: head/sys/dev/iwm/if_iwm.c
==============================================================================
--- head/sys/dev/iwm/if_iwm.c   Mon Sep 19 22:11:34 2016        (r306001)
+++ head/sys/dev/iwm/if_iwm.c   Mon Sep 19 22:13:08 2016        (r306002)
@@ -5762,7 +5762,7 @@ iwm_attach(device_t dev)
                                   IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
                                   IWM_CSR_GP_CNTRL_REG_FLAG_MAC_CLOCK_READY,
                                   25000);
-               if (ret < 0) {
+               if (!ret) {
                        device_printf(sc->sc_dev,
                            "Failed to wake up the nic\n");
                        goto fail;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to