Merge branch 'master' of...

that was discovered).

Typically, such an event will be propagated to NFC Core from MSGRXWQ context.

Error management

----------------

Errors that occur synchronously with the execution of an NFC Core request are

simply returned as the execution result of the request. These are easy.

Errors that occur asynchronously (e.g. in a background protocol handling thread)

must be reported such that upper layers don't stay ignorant that something

went wrong below and know that expected events will probably never happen.

Handling of these errors is done as follows:

- driver (pn544) fails to deliver an incoming frame: it stores the error such

that any subsequent call to the driver will result in this error. Then it calls

the standard nfc_shdlc_recv_frame() with a NULL argument to report the problem

above. shdlc stores a EREMOTEIO sticky status, which will trigger SMW to

report above in turn.

- SMW is basically a background thread to handle incoming and outgoing shdlc

frames. This thread will also check the shdlc sticky status and report to HCI

when it discovers it is not able to run anymore because of an unrecoverable

error that happened within shdlc or below. If the problem occurs during shdlc

connection, the error is reported through the connect completion.

- HCI: if an internal HCI error happens (frame is lost), or HCI is reported an

error from a lower layer, HCI will either complete the currently executing

command with that error, or notify NFC Core directly if no command is executing.

- NFC Core: when NFC Core is notified of an error from below and polling is

active, it will send a tag discovered event with an empty tag list to the user

space to let it know that the poll operation will never be able to detect a tag.

If polling is not active and the error was sticky, lower levels will return it

at next invocation.

S:	Supported

F:	drivers/net/wireless/iwlwifi/

INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)

M:	Samuel Ortiz <samuel.ortiz@intel.com>

M:	Intel Linux Wireless <ilw@linux.intel.com>

L:	linux-wireless@vger.kernel.org

S:	Supported

W:	http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi

F:	drivers/net/wireless/iwmc3200wifi/

INTEL MANAGEMENT ENGINE (mei)

M:	Tomas Winkler <tomas.winkler@intel.com>

L:	linux-kernel@vger.kernel.org

#define BCMA_CORE_SIZE		0x1000

#define bcma_err(bus, fmt, ...) \

	pr_err("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)

#define bcma_warn(bus, fmt, ...) \

	pr_warn("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)

#define bcma_info(bus, fmt, ...) \

	pr_info("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)

#define bcma_debug(bus, fmt, ...) \

	pr_debug("bus%d: " fmt, (bus)->num, ##__VA_ARGS__)

struct bcma_bus;

/* main.c */

			udelay(10);

		}

		if (i)

			pr_err("HT force timeout\n");

			bcma_err(core->bus, "HT force timeout\n");

		break;

	case BCMA_CLKMODE_DYNAMIC:

		bcma_set32(core, BCMA_CLKCTLST, ~BCMA_CLKCTLST_FORCEHT);

			udelay(10);

		}

		if (i)

			pr_err("PLL enable timeout\n");

			bcma_err(core->bus, "PLL enable timeout\n");

	} else {

		pr_warn("Disabling PLL not supported yet!\n");

		bcma_warn(core->bus, "Disabling PLL not supported yet!\n");

	}

}

EXPORT_SYMBOL_GPL(bcma_core_pll_ctl);

		else

			return BCMA_DMA_TRANSLATION_DMA32_CMT;

	default:

		pr_err("DMA translation unknown for host %d\n",

		bcma_err(core->bus, "DMA translation unknown for host %d\n",

			 core->bus->hosttype);

	}

	return BCMA_DMA_TRANSLATION_NONE;

	if (cc->capabilities & BCMA_CC_CAP_PMU)

		bcma_pmu_init(cc);

	if (cc->capabilities & BCMA_CC_CAP_PCTL)

		pr_err("Power control not implemented!\n");

		bcma_err(cc->core->bus, "Power control not implemented!\n");

	if (cc->core->id.rev >= 16) {

		if (cc->core->bus->sprom.leddc_on_time &&

				       | BCMA_CC_CORECTL_UARTCLKEN);

		}

	} else {

		pr_err("serial not supported on this device ccrev: 0x%x\n",

		       ccrev);

		bcma_err(cc->core->bus, "serial not supported on this device ccrev: 0x%x\n", ccrev);

		return;

	}