View | Details | Raw Unified | Return to bug 145197
Collapse All | Expand All

(-)build/drivers/net/e100.c (-3 / +11 lines)
Lines 1298-1305 static inline int e100_exec_cb_wait(stru Link Here
1298
	int err = 0, counter = 50;
1298
	int err = 0, counter = 50;
1299
	struct cb *cb = nic->cb_to_clean;
1299
	struct cb *cb = nic->cb_to_clean;
1300
1300
1301
	if ((err = e100_exec_cb(nic, NULL, e100_setup_ucode)))
1301
	if ((err = e100_exec_cb(nic, NULL, e100_setup_ucode))) {
1302
		DPRINTK(PROBE,ERR, "ucode cmd failed with error %d\n", err);
1302
		DPRINTK(PROBE,ERR, "ucode cmd failed with error %d\n", err);
1303
		return err;
1304
	}
1303
1305
1304
	/* must restart cuc */
1306
	/* must restart cuc */
1305
	nic->cuc_cmd = cuc_start;
1307
	nic->cuc_cmd = cuc_start;
Lines 1721-1729 static int e100_alloc_cbs(struct nic *ni Link Here
1721
	struct cb *cb;
1723
	struct cb *cb;
1722
	unsigned int i, count = nic->params.cbs.count;
1724
	unsigned int i, count = nic->params.cbs.count;
1723
1725
1726
	/* bail out if we've been here before */
1727
	if (nic->cbs_avail)
1728
		return 0;
1729
1724
	nic->cuc_cmd = cuc_start;
1730
	nic->cuc_cmd = cuc_start;
1725
	nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
1726
	nic->cbs_avail = 0;
1727
1731
1728
	nic->cbs = pci_alloc_consistent(nic->pdev,
1732
	nic->cbs = pci_alloc_consistent(nic->pdev,
1729
		sizeof(struct cb) * count, &nic->cbs_dma_addr);
1733
		sizeof(struct cb) * count, &nic->cbs_dma_addr);
Lines 2578-2583 static int __devinit e100_probe(struct p Link Here
2578
	nic->pdev = pdev;
2582
	nic->pdev = pdev;
2579
	nic->msg_enable = (1 << debug) - 1;
2583
	nic->msg_enable = (1 << debug) - 1;
2580
	pci_set_drvdata(pdev, netdev);
2584
	pci_set_drvdata(pdev, netdev);
2585
	nic->cb_to_use = nic->cb_to_send = nic->cb_to_clean = NULL;
2586
	nic->cbs_avail = 0;
2581
2587
2582
	if((err = pci_enable_device(pdev))) {
2588
	if((err = pci_enable_device(pdev))) {
2583
		DPRINTK(PROBE, ERR, "Cannot enable PCI device, aborting.\n");
2589
		DPRINTK(PROBE, ERR, "Cannot enable PCI device, aborting.\n");
Lines 2752-2757 static int e100_resume(struct pci_dev *p Link Here
2752
	retval = pci_enable_wake(pdev, 0, 0);
2758
	retval = pci_enable_wake(pdev, 0, 0);
2753
	if (retval)
2759
	if (retval)
2754
		DPRINTK(PROBE,ERR, "Error clearing wake events\n");
2760
		DPRINTK(PROBE,ERR, "Error clearing wake events\n");
2761
	if ((retval = e100_alloc_cbs(nic)))
2762
		DPRINTK(PROBE,ERR, "No memory for cbs\n");
2755
	if(e100_hw_init(nic))
2763
	if(e100_hw_init(nic))
2756
		DPRINTK(HW, ERR, "e100_hw_init failed\n");
2764
		DPRINTK(HW, ERR, "e100_hw_init failed\n");
2757
2765

Return to bug 145197