View | Details | Raw Unified | Return to bug 133513
Collapse All | Expand All

(-)ipw2200-1.0.6/ipw2200.c (-1 / +4 lines)
Lines 9069-9074 static int ipw_request_direct_scan(struc Link Here
9069
	struct ipw_scan_request_ext scan;
9069
	struct ipw_scan_request_ext scan;
9070
	int err = 0, scan_type;
9070
	int err = 0, scan_type;
9071
9071
9072
again:
9072
	down(&priv->sem);
9073
	down(&priv->sem);
9073
9074
9074
	if (priv->status & STATUS_RF_KILL_MASK) {
9075
	if (priv->status & STATUS_RF_KILL_MASK) {
Lines 9080-9092 static int ipw_request_direct_scan(struc Link Here
9080
	IPW_DEBUG_HC("starting request direct scan!\n");
9081
	IPW_DEBUG_HC("starting request direct scan!\n");
9081
9082
9082
	if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
9083
	if (priv->status & (STATUS_SCANNING | STATUS_SCAN_ABORTING)) {
9084
		up(&priv->sem);
9083
		err = wait_event_interruptible(priv->wait_state,
9085
		err = wait_event_interruptible(priv->wait_state,
9084
				!(priv->status & (STATUS_SCANNING |
9086
				!(priv->status & (STATUS_SCANNING |
9085
						  STATUS_SCAN_ABORTING)));
9087
						  STATUS_SCAN_ABORTING)));
9086
		if (err) {
9088
		if (err) {
9087
			IPW_DEBUG_HC("aborting direct scan");
9089
			IPW_DEBUG_HC("aborting direct scan");
9088
			goto done;
9090
			return err;
9089
		}
9091
		}
9092
		goto again;
9090
	}
9093
	}
9091
	memset(&scan, 0, sizeof(scan));
9094
	memset(&scan, 0, sizeof(scan));
9092
9095

Return to bug 133513