Merge remote-tracking branch 'regmap/topic/drivers' into regmap-next

Resolved simple add/add conflicts:
	drivers/base/regmap/internal.h
	drivers/base/regmap/regmap.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_bios.c b/drivers/gpu/drm/radeon/radeon_bios.c
index 229a20f10e2..501f4881e5a 100644
--- a/drivers/gpu/drm/radeon/radeon_bios.c
+++ b/drivers/gpu/drm/radeon/radeon_bios.c
@@ -120,7 +120,7 @@ static bool radeon_atrm_get_bios(struct radeon_device *rdev)
                 ret = radeon_atrm_get_bios_chunk(rdev->bios,
                                                  (i * ATRM_BIOS_PAGE),
                                                  ATRM_BIOS_PAGE);
-                if (ret <= 0)
+                if (ret < ATRM_BIOS_PAGE)
                         break;
         }