The patch titled
Broadcom 4400 resume small fix
has been removed from the -mm tree. Its filename was
broadcom-4400-resume-small-fix-v2.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: Broadcom 4400 resume small fix
From: Dmitriy Monakhov <[EMAIL PROTECTED]>
Some issues in b44_resume().
- Return value of pci_enable_device() was ignored.
- If request_irq() has failed we have to just disable device and exit.
Signed-off-by: Dmitriy Monakhov <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
drivers/net/b44.c | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff -puN drivers/net/b44.c~broadcom-4400-resume-small-fix-v2 drivers/net/b44.c
--- a/drivers/net/b44.c~broadcom-4400-resume-small-fix-v2
+++ a/drivers/net/b44.c
@@ -2320,16 +2320,27 @@ static int b44_resume(struct pci_dev *pd
{
struct net_device *dev = pci_get_drvdata(pdev);
struct b44 *bp = netdev_priv(dev);
+ int rc = 0;
pci_restore_state(pdev);
- pci_enable_device(pdev);
+ rc = pci_enable_device(pdev);
+ if (rc) {
+ printk(KERN_ERR PFX "%s: pci_enable_device failed\n",
+ dev->name);
+ return rc;
+ }
+
pci_set_master(pdev);
if (!netif_running(dev))
return 0;
- if (request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev))
+ rc = request_irq(dev->irq, b44_interrupt, IRQF_SHARED, dev->name, dev);
+ if (rc) {
printk(KERN_ERR PFX "%s: request_irq failed\n", dev->name);
+ pci_disable_device(pdev);
+ return rc;
+ }
spin_lock_irq(&bp->lock);
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
origin.patch
ext-jbd-layer-function-called-instead-of-fs-specific-one.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
