Skip to content

Commit

Permalink
drm/ast: Fix missing conversions to managed API
Browse files Browse the repository at this point in the history
[ Upstream commit 9ea172a ]

The commit 7cbb93d ("drm/ast: Use managed pci functions")
converted a few PCI accessors to the managed API and dropped the
manual pci_iounmap() calls, but it seems to have forgotten converting
pci_iomap() to the managed one.  It resulted in the leftover resources
after the driver unbind.  Let's fix them.

Fixes: 7cbb93d ("drm/ast: Use managed pci functions")
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421170458.21178-1-tiwai@suse.de
Signed-off-by: Sasha Levin <sashal@kernel.org>
  • Loading branch information
tiwai authored and gregkh committed Jul 14, 2021
1 parent 72d9bbe commit c39cecc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/gpu/drm/ast/ast_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,

pci_set_drvdata(pdev, dev);

ast->regs = pci_iomap(pdev, 1, 0);
ast->regs = pcim_iomap(pdev, 1, 0);
if (!ast->regs)
return ERR_PTR(-EIO);

Expand All @@ -429,7 +429,7 @@ struct ast_private *ast_device_create(const struct drm_driver *drv,

/* "map" IO regs if the above hasn't done so already */
if (!ast->ioregs) {
ast->ioregs = pci_iomap(pdev, 2, 0);
ast->ioregs = pcim_iomap(pdev, 2, 0);
if (!ast->ioregs)
return ERR_PTR(-EIO);
}
Expand Down

0 comments on commit c39cecc

Please sign in to comment.