diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2008-11-22 17:34:24 +0000 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-11-30 10:03:36 -0800 |
| commit | 596f1034190565529e507e1eb8df6def1c9f5560 (patch) | |
| tree | 0995a80e36141a703c1df908c24db47d02bfd4db /drivers/crypto | |
| parent | 6005e3eb89db99f3737c8f5fe3d97f3262ed7919 (diff) | |
| download | linux-stable-596f1034190565529e507e1eb8df6def1c9f5560.tar.gz linux-stable-596f1034190565529e507e1eb8df6def1c9f5560.tar.bz2 linux-stable-596f1034190565529e507e1eb8df6def1c9f5560.zip | |
fix talitos
talitos_remove() can be called from talitos_probe() on failure
exit path, so it can't be __devexit.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers/crypto')
| -rw-r--r-- | drivers/crypto/talitos.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c index b6ad3ac5916e..24607669a52b 100644 --- a/drivers/crypto/talitos.c +++ b/drivers/crypto/talitos.c @@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template) return ret; } -static int __devexit talitos_remove(struct of_device *ofdev) +static int talitos_remove(struct of_device *ofdev) { struct device *dev = &ofdev->dev; struct talitos_private *priv = dev_get_drvdata(dev); @@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = { .name = "talitos", .match_table = talitos_match, .probe = talitos_probe, - .remove = __devexit_p(talitos_remove), + .remove = talitos_remove, }; static int __init talitos_init(void) |