summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2021-02-28 15:48:25 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2021-02-28 15:48:25 -0800
commitd346da4a4a4485e3e728569a48bec6bfbf9e53d5 (patch)
treec6239388f43079cced9e9e0f5fc6e5f9ecea2909
parent06d5d309a3f17e32cd59926f391db1e1ea652184 (diff)
parent07f1dc8cc85bbfb2f9270f25060c4755f4509f45 (diff)
downloadlinux-d346da4a4a4485e3e728569a48bec6bfbf9e53d5.tar.bz2
Merge tag 'ide-5.11-2021-02-28' of git://git.kernel.dk/linux-block
Pull ide fix from Jens Axboe: "This is a leftover fix from 5.11, where I forgot to ship it your way" * tag 'ide-5.11-2021-02-28' of git://git.kernel.dk/linux-block: ide/falconide: Fix module unload
-rw-r--r--drivers/ide/falconide.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index 77af4c1a3f38..bb86d84558d9 100644
--- a/drivers/ide/falconide.c
+++ b/drivers/ide/falconide.c
@@ -164,6 +164,7 @@ static int __init falconide_init(struct platform_device *pdev)
if (rc)
goto err_free;
+ platform_set_drvdata(pdev, host);
return 0;
err_free:
ide_host_free(host);
@@ -174,7 +175,7 @@ err:
static int falconide_remove(struct platform_device *pdev)
{
- struct ide_host *host = dev_get_drvdata(&pdev->dev);
+ struct ide_host *host = platform_get_drvdata(pdev);
ide_host_remove(host);