Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3210d190 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 

* 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6:
  firewire: core: handle ack_busy when fetching the Config ROM
parents 6719db6a aaff1203

drivers/firewire/core-device.c

+10 −5
Original line number Diff line number Diff line
@@ -455,15 +455,20 @@ static struct device_attribute fw_device_attributes[] = { 
static int read_rom(struct fw_device *device,

		    int generation, int index, u32 *data)

{

	int rcode;

	u64 offset = (CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4;

	int i, rcode;



	/* device->node_id, accessed below, must not be older than generation */

	smp_rmb();



	rcode = fw_run_transaction(device->card, TCODE_READ_QUADLET_REQUEST,

			device->node_id, generation, device->max_speed,

			(CSR_REGISTER_BASE | CSR_CONFIG_ROM) + index * 4,

			data, 4);

	for (i = 10; i < 100; i += 10) {

		rcode = fw_run_transaction(device->card,

				TCODE_READ_QUADLET_REQUEST, device->node_id,

				generation, device->max_speed, offset, data, 4);

		if (rcode != RCODE_BUSY)

			break;

		msleep(i);

	}

	be32_to_cpus(data);



	return rcode;