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>
This commit is contained in:
parent
6005e3eb89
commit
596f103419
1 changed files with 2 additions and 2 deletions
|
@ -1357,7 +1357,7 @@ static int hw_supports(struct device *dev, __be32 desc_hdr_template)
|
||||||
return ret;
|
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 device *dev = &ofdev->dev;
|
||||||
struct talitos_private *priv = dev_get_drvdata(dev);
|
struct talitos_private *priv = dev_get_drvdata(dev);
|
||||||
|
@ -1622,7 +1622,7 @@ static struct of_platform_driver talitos_driver = {
|
||||||
.name = "talitos",
|
.name = "talitos",
|
||||||
.match_table = talitos_match,
|
.match_table = talitos_match,
|
||||||
.probe = talitos_probe,
|
.probe = talitos_probe,
|
||||||
.remove = __devexit_p(talitos_remove),
|
.remove = talitos_remove,
|
||||||
};
|
};
|
||||||
|
|
||||||
static int __init talitos_init(void)
|
static int __init talitos_init(void)
|
||||||
|
|
Loading…
Reference in a new issue