diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-01 00:48:25 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-03-01 00:48:25 +0100 |
| commit | d346da4a4a4485e3e728569a48bec6bfbf9e53d5 (patch) | |
| tree | c6239388f43079cced9e9e0f5fc6e5f9ecea2909 | |
| parent | Merge tag 'kbuild-fixes-v5.12' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| parent | ide/falconide: Fix module unload (diff) | |
| download | linux-d346da4a4a4485e3e728569a48bec6bfbf9e53d5.tar.xz linux-d346da4a4a4485e3e728569a48bec6bfbf9e53d5.zip | |
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.c | 3 |
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); |