diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:32:23 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-24 08:32:23 -0700 |
| commit | 198aa045601d20f39658c892dc626e16993bae78 (patch) | |
| tree | ef000627fabe4fa3ff1818dc2e591b6417ca1eb6 /drivers | |
| parent | 58be18c4de37b9277b045c0b5bb123a664dac9ed (diff) | |
| parent | adfe7c69891128f5e238a5e6823709b4bb85b340 (diff) | |
| download | linux-198aa045601d20f39658c892dc626e16993bae78.tar.bz2 | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
m68k: Update defconfigs for 2.6.30-rc3
m68k,m68knommu: Wire up preadv and pwritev
scsi: a4000 - Correct driver unregistration in case of failure
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/scsi/a4000t.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/a4000t.c b/drivers/scsi/a4000t.c index 61af3d91ac8a..e3519fa5a3ba 100644 --- a/drivers/scsi/a4000t.c +++ b/drivers/scsi/a4000t.c @@ -129,7 +129,7 @@ static int __init a4000t_scsi_init(void) a4000t_scsi_device = platform_device_register_simple("a4000t-scsi", -1, NULL, 0); if (IS_ERR(a4000t_scsi_device)) { - platform_driver_register(&a4000t_scsi_driver); + platform_driver_unregister(&a4000t_scsi_driver); return PTR_ERR(a4000t_scsi_device); } |