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

diff --git a/drivers/ide/falconide.c b/drivers/ide/falconide.c
index 77af4c1a3f38ce41d037d707f05b4187f85188cf..bb86d84558d9ad24403874c85abaa3ee0ad8e74f 100644 (file)
--- 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);