diff options
| author | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 08:41:17 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.osdl.org> | 2006-12-04 08:41:17 -0800 |
| commit | 12472b4165a21f5415ff4f60f8f46311a6b7b9ac (patch) | |
| tree | 8e54c608abb016a4e02a359bc508f575e2f1d7fa /drivers | |
| parent | a79f43a54b7df7b12bc1c0fbf4ba76520ba40354 (diff) | |
| parent | ef9467f8f0803881d6b20ad6f0f770fc39bcc2c2 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[SUNHME]: Fix for sunhme failures on x86
[XFRM] xfrm_user: Better validation of user templates.
[DCCP] tfrc: Binary search for reverse TFRC lookup
[DCCP] ccid3: Deprecate TFRC_SMALLEST_P
[DCCP] tfrc: Identify TFRC table limits and simplify code
[DCCP] tfrc: Add protection against invalid parameters to TFRC routines
[DCCP] tfrc: Fix small error in reverse lookup of p for given f(p)
[DCCP] tfrc: Document boundaries and limits of the TFRC lookup table
[DCCP] ccid3: Fix warning message about illegal ACK
[DCCP] ccid3: Fix bug in calculation of send rate
[DCCP]: Fix BUG in retransmission delay calculation
[DCCP]: Use higher RTO default for CCID3
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/sunhme.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c index ec432ea879f..df40e34c776 100644 --- a/drivers/net/sunhme.c +++ b/drivers/net/sunhme.c @@ -3012,6 +3012,11 @@ static int __devinit happy_meal_pci_probe(struct pci_dev *pdev, #endif err = -ENODEV; + + if (pci_enable_device(pdev)) + goto err_out; + pci_set_master(pdev); + if (!strcmp(prom_name, "SUNW,qfe") || !strcmp(prom_name, "qfe")) { qp = quattro_pci_find(pdev); if (qp == NULL) |