From 44fc0d8a431a38f1199acb3fabfa5bc3cc3d7db6 Mon Sep 17 00:00:00 2001 From: Henrik Kretzschmar Date: Mon, 24 Jul 2006 14:42:01 +0200 Subject: [PATCH] --- yaml --- r: 35109 b: refs/heads/master c: e1c3e5014040869abd6ef2cdf987e7c74cb40ada h: refs/heads/master i: 35107: ab3c8a80b0a7b1c8f1a8f2e4aa9f4abf58b3c6dd v: v3 --- [refs] | 2 +- trunk/drivers/net/tulip/uli526x.c | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index b895d82b4ded..1a0da19eeafc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8bed49ecfb47a40cc401f5ec7c9a8a38098e728 +refs/heads/master: e1c3e5014040869abd6ef2cdf987e7c74cb40ada diff --git a/trunk/drivers/net/tulip/uli526x.c b/trunk/drivers/net/tulip/uli526x.c index fd64b2b3e99c..c4c720e2d4c3 100644 --- a/trunk/drivers/net/tulip/uli526x.c +++ b/trunk/drivers/net/tulip/uli526x.c @@ -1702,7 +1702,6 @@ MODULE_PARM_DESC(mode, "ULi M5261/M5263: Bit 0: 10/100Mbps, bit 2: duplex, bit 8 static int __init uli526x_init_module(void) { - int rc; printk(version); printed_version = 1; @@ -1714,22 +1713,19 @@ static int __init uli526x_init_module(void) if (cr6set) uli526x_cr6_user_set = cr6set; - switch(mode) { + switch (mode) { case ULI526X_10MHF: case ULI526X_100MHF: case ULI526X_10MFD: case ULI526X_100MFD: uli526x_media_mode = mode; break; - default:uli526x_media_mode = ULI526X_AUTO; + default: + uli526x_media_mode = ULI526X_AUTO; break; } - rc = pci_module_init(&uli526x_driver); - if (rc < 0) - return rc; - - return 0; + return pci_register_driver(&uli526x_driver); }