Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (1bda7128) · Commits · e / devices / android_kernel_teracube_2e

drivers/ieee1394/nodemgr.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -115,8 +115,14 @@ static int nodemgr_bus_read(struct csr1212_csr *csr, u64 addr, u16 length,
		return error;
		}

		#define OUI_FREECOM_TECHNOLOGIES_GMBH 0x0001db

		static int nodemgr_get_max_rom(quadlet_t bus_info_data, void __ci)
		{
		/* Freecom FireWire Hard Drive firmware bug */
		if (be32_to_cpu(bus_info_data[3]) >> 8 == OUI_FREECOM_TECHNOLOGIES_GMBH)
		return 0;

		return (be32_to_cpu(bus_info_data[2]) >> 8) & 0x3;
		}