diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:29:06 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-07-29 13:29:06 -0700 |
| commit | 1a81a8f2a5918956e214bb718099a89e500e7ec5 (patch) | |
| tree | 3ee00d0259b0f1c9f70784a835522365246ce7c0 /drivers/ide/ide-tape.c | |
| parent | 86505fc06b6f1ee8a13473053a41ed01948e2d4f (diff) | |
| parent | d4f8c2e0f827a0b3a322c449ac331ae41feeb359 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide
Pull IDE updates from David Miller:
"Just a couple small bug fixes, nothing overly exciting in here"
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/ide:
ide: missing break statement in set_timings_mdma()
ide: hpt366: fix incorrect mask when checking at cmd_high_time
ide-tape: fix misprint in failure handling in idetape_init()
cmd640: add __init attribute
Diffstat (limited to 'drivers/ide/ide-tape.c')
| -rw-r--r-- | drivers/ide/ide-tape.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/ide/ide-tape.c b/drivers/ide/ide-tape.c index 12fa04997dcc..9ecf4e35adcd 100644 --- a/drivers/ide/ide-tape.c +++ b/drivers/ide/ide-tape.c @@ -2052,12 +2052,12 @@ static int __init idetape_init(void) error = driver_register(&idetape_driver.gen_driver); if (error) - goto out_free_driver; + goto out_free_chrdev; return 0; -out_free_driver: - driver_unregister(&idetape_driver.gen_driver); +out_free_chrdev: + unregister_chrdev(IDETAPE_MAJOR, "ht"); out_free_class: class_destroy(idetape_sysfs_class); out: |