View | Details | Raw Unified | Return to bug 197143 | Differences between
and this patch

Collapse All | Expand All

(-)sys/dev/wpi/if_wpi.c (-1 / +12 lines)
Lines 3600-3605 Link Here
3600
	if (sc->sc_scan_timer) {
3600
	if (sc->sc_scan_timer) {
3601
		device_printf(sc->sc_dev, "%s: called whilst scanning!\n",
3601
		device_printf(sc->sc_dev, "%s: called whilst scanning!\n",
3602
		    __func__);
3602
		    __func__);
3603
3604
		DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__);
3605
3603
		return (EAGAIN);
3606
		return (EAGAIN);
3604
	}
3607
	}
3605
3608
Lines 3608-3614 Link Here
3608
		device_printf(sc->sc_dev,
3611
		device_printf(sc->sc_dev,
3609
		    "%s: could not allocate buffer for scan command\n",
3612
		    "%s: could not allocate buffer for scan command\n",
3610
		    __func__);
3613
		    __func__);
3611
		return ENOMEM;
3614
		error = ENOMEM;
3615
		goto fail;
3612
	}
3616
	}
3613
	hdr = (struct wpi_scan_hdr *)buf;
3617
	hdr = (struct wpi_scan_hdr *)buf;
3614
3618
Lines 3733-3742 Link Here
3733
	error = wpi_cmd(sc, WPI_CMD_SCAN, buf, buflen, 1);
3737
	error = wpi_cmd(sc, WPI_CMD_SCAN, buf, buflen, 1);
3734
	free(buf, M_DEVBUF);
3738
	free(buf, M_DEVBUF);
3735
3739
3740
	if (error != 0)
3741
		goto fail;
3742
3736
	sc->sc_scan_timer = 5;
3743
	sc->sc_scan_timer = 5;
3737
3744
3738
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
3745
	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END, __func__);
3739
3746
3747
	return 0;
3748
3749
fail:	DPRINTF(sc, WPI_DEBUG_TRACE, TRACE_STR_END_ERR, __func__);
3750
3740
	return error;
3751
	return error;
3741
}
3752
}
3742
3753

Return to bug 197143