From: Michał Mirosław mirq-linux@rere.qmqm.pl
commit e0ba1a39b8dfe4f005bebdd85daa89e7382e26b7 upstream.
Return on error directly from the BAR-iterating loop instead of break+return.
This is actually a cosmetic fix, since it would be highly unusual to have this called for a PCI device without any memory BARs.
Fixes: 9d69ef183815 ("fbdev/core: Remove remove_conflicting_pci_framebuffers()") Signed-off-by: Michał Mirosław mirq-linux@rere.qmqm.pl Signed-off-by: Thomas Zimmermann tzimmermann@suse.de Link: https://patchwork.freedesktop.org/patch/msgid/e75323732bedc46d613d72ecb40f97... Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- drivers/video/aperture.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/video/aperture.c +++ b/drivers/video/aperture.c @@ -351,12 +351,9 @@ int aperture_remove_conflicting_pci_devi size = pci_resource_len(pdev, bar); ret = aperture_remove_conflicting_devices(base, size, primary, name); if (ret) - break; + return ret; }
- if (ret) - return ret; - /* * If a driver asked to unregister a platform device registered by * sysfb, then can be assumed that this is a driver for a display