Skip to contentSkip to conversation

drm/radeon: missing break statement

PATCH In review Dan Carpenter 3 participants 3 messages Jun 23, 2015

Subsystems (3)
DRM drivers Kernel janitors Radeon and amdgpu DRM drivers
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 drm/radeon: missing break statement

There was a merge problem in linux-next 4598d330d29e ('Merge remote-tracking branch 'drm/drm-next''). We need to add a break statement.

Signed-off-by Dan Carpenter <[email protected]>
drivers/gpu/drm/radeon/radeon_kms.c +1 -0
index b4b457d..4a119c2 100644
@@ -578,6 +578,7 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
 		break;
 	case RADEON_INFO_VA_UNMAP_WORKING:
 		*value = true;
+		break;
 	case RADEON_INFO_GPU_RESET_COUNTER:
 		*value = atomic_read(&rdev->gpu_reset_counter);
 		break;
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 5 lines · Dan Carpenter

There was a merge problem in linux-next 4598d330d29e ('Merge remote-tracking branch 'drm/drm-next''). We need to add a break statement.

Signed-off-by Dan Carpenter <[email protected]>

Good catch, fortunately only an issue in drm-next.

Reviewed-by Christian König <[email protected]>

drivers/gpu/drm/radeon/radeon_kms.c static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file · line 584

Quoted 13 lines
drivers/gpu/drm/radeon/radeon_kms.c +1 -0
index b4b457d..4a119c2 100644
@@ -578,6 +578,7 @@ static int radeon_info_ioctl(struct drm_device *dev, void *data, struct drm_file
  		break;
  	case RADEON_INFO_VA_UNMAP_WORKING:
  		*value = true;
+		break;
  	case RADEON_INFO_GPU_RESET_COUNTER:
  		*value = atomic_read(&rdev->gpu_reset_counter);
  		break;

--
To unsubscribe from this list: send the line "unsubscribe kernel-janitors" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#2 lore raw
In reply to Dan Carpenter

Hi Dan,

Quoted 4 lines · On Tue, 23 Jun 2015 14:51:48 +0300 Dan Carpenter <[email protected]>…

There was a merge problem in linux-next 4598d330d29e ('Merge remote-tracking branch 'drm/drm-next''). We need to add a break statement.

Thanks for noticing. I have fixed my merge resolution for the next release and hopefully Linus will do it right when he merges the drm tree (if it is still necessary).

Signature · 2 lines
Cheers,
Stephen Rothwell                    [email protected]