Skip to content

C
clone-Linux

gsplhtlxg / clone-Linux

通知 2
Star 0
Fork 1
C
clone-Linux

体验新版 GitCode，发现更多精彩内容 >>

提交 e7f52e4c 编写于 作者: J Jeff Garzik
浏览文件
操作

Merge branch 'for-jeff' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6

上级 249b94a5 10487fbd
隐藏空白更改
内联 并排
Showing with 2 addition and 2 deletion
drivers/net/sis190.c
浏览文件 @ e7f52e4c
...@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, ...@@ -1791,6 +1791,8 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
goto out; goto out;
} }
pci_set_drvdata(pdev, dev);
tp = netdev_priv(dev); tp = netdev_priv(dev);
ioaddr = tp->mmio_addr; ioaddr = tp->mmio_addr;
...@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev, ...@@ -1827,8 +1829,6 @@ static int __devinit sis190_init_one(struct pci_dev *pdev,
if (rc < 0) if (rc < 0)
goto err_remove_mii; goto err_remove_mii;
pci_set_drvdata(pdev, dev);
net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), " net_probe(tp, KERN_INFO "%s: %s at %p (IRQ: %d), "
"%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n", "%2.2x:%2.2x:%2.2x:%2.2x:%2.2x:%2.2x\n",
pci_name(pdev), sis_chip_info[ent->driver_data].name, pci_name(pdev), sis_chip_info[ent->driver_data].name,
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或