diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:49:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-12-01 15:49:37 -0800 |
| commit | f327220b1494aa23fd4206ac4778b8aa449a3351 (patch) | |
| tree | b463d2541db1638c7cb8b9ff10a9238fc8a47000 /drivers/net/jazzsonic.c | |
| parent | 31b3c31bca3b4df975631323d6ee6f49f43f4956 (diff) | |
| parent | ea182d4aefa3a27847d890b1592a608d1180aa45 (diff) | |
Merge branch 'upstream-fixes' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6
Diffstat (limited to 'drivers/net/jazzsonic.c')
| -rw-r--r-- | drivers/net/jazzsonic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/jazzsonic.c b/drivers/net/jazzsonic.c index b039bd89ceb..272d331d29c 100644 --- a/drivers/net/jazzsonic.c +++ b/drivers/net/jazzsonic.c @@ -296,7 +296,7 @@ static int __init jazz_sonic_init_module(void) } jazz_sonic_device = platform_device_alloc(jazz_sonic_string, 0); - if (!jazz_sonnic_device) + if (!jazz_sonic_device) goto out_unregister; if (platform_device_add(jazz_sonic_device)) { @@ -307,7 +307,7 @@ static int __init jazz_sonic_init_module(void) return 0; out_unregister: - driver_unregister(&jazz_sonic_driver); + platform_driver_unregister(&jazz_sonic_driver); return -ENOMEM; } |