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

drivers/firewire/fw-ohci.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1945,10 +1945,8 @@ static int pci_suspend(struct pci_dev *pdev, pm_message_t state)
	return err;		return err;
	}		}
	err = pci_set_power_state(pdev, pci_choose_state(pdev, state));		err = pci_set_power_state(pdev, pci_choose_state(pdev, state));
	if (err) {		if (err)
	fw_error("pci_set_power_state failed\n");		fw_error("pci_set_power_state failed with %d\n", err);
	return err;
	}

	return 0;		return 0;
	}		}