aboutsummaryrefslogtreecommitdiff
path: root/drivers/net/jazzsonic.c
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-12-01 04:51:26 -0500
committerJeff Garzik <jgarzik@pobox.com>2005-12-01 04:51:26 -0500
commit62d65a8062530a4b2673999deb9be368fa60ca87 (patch)
tree89ccd9b8de02b247f145275311378280ae26cdfb /drivers/net/jazzsonic.c
parentf89b23217372ed9bdba8804c1616d445402d1e05 (diff)
parentea182d4aefa3a27847d890b1592a608d1180aa45 (diff)
Merge branch 'upstream-fixes'
Diffstat (limited to 'drivers/net/jazzsonic.c')
-rw-r--r--drivers/net/jazzsonic.c4
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;
}