Merge branch 'origin'

Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/net/b44.c b/drivers/net/b44.c
index df9d6e80c4f2..c3267e4e1bb0 100644
--- a/drivers/net/b44.c
+++ b/drivers/net/b44.c
@@ -1399,7 +1399,6 @@ static int b44_open(struct net_device *dev)
         b44_init_rings(bp);
         b44_init_hw(bp);
 
-        netif_carrier_off(dev);
         b44_check_phy(bp);
 
         err = request_irq(dev->irq, b44_interrupt, SA_SHIRQ, dev->name, dev);
@@ -1464,7 +1463,7 @@ static int b44_close(struct net_device *dev)
 #endif
         b44_halt(bp);
         b44_free_rings(bp);
-        netif_carrier_off(bp->dev);
+        netif_carrier_off(dev);
 
         spin_unlock_irq(&bp->lock);
 
@@ -2000,6 +1999,8 @@ static int __devinit b44_init_one(struct pci_dev *pdev,
         dev->irq = pdev->irq;
         SET_ETHTOOL_OPS(dev, &b44_ethtool_ops);
 
+        netif_carrier_off(dev);
+
         err = b44_get_invariants(bp);
         if (err) {
                 printk(KERN_ERR PFX "Problem fetching invariants of chip, "