Merge branch 'movieboard' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394-2.6 (83e95697) · Commits · e / devices / android_kernel_samsung_universal8890

drivers/firewire/ohci.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -264,6 +264,7 @@ static char ohci_driver_name[] = KBUILD_MODNAME;
		#define PCI_DEVICE_ID_AGERE_FW643 0x5901
		#define PCI_DEVICE_ID_JMICRON_JMB38X_FW 0x2380
		#define PCI_DEVICE_ID_TI_TSB12LV22 0x8009
		#define PCI_VENDOR_ID_PINNACLE_SYSTEMS 0x11bd

		#define QUIRK_CYCLE_TIMER 1
		#define QUIRK_RESET_PACKET 2
		@@ -3190,6 +3191,11 @@ static int __devinit pci_probe(struct pci_dev *dev,
		int i, err;
		size_t size;

		if (dev->vendor == PCI_VENDOR_ID_PINNACLE_SYSTEMS) {
		dev_err(&dev->dev, "Pinnacle MovieBoard is not yet supported\n");
		return -ENOSYS;
		}

		ohci = kzalloc(sizeof(*ohci), GFP_KERNEL);
		if (ohci == NULL) {
		err = -ENOMEM;