diff mbox

[-next] drm/radeon: missing break statement

Message ID 20150623115148.GA6302@mwanda (mailing list archive)
State New, archived
Headers show

Commit Message

Dan Carpenter June 23, 2015, 11:51 a.m. UTC 
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 <dan.carpenter@oracle.com>

Comments

Christian König June 23, 2015, 11:56 a.m. UTC | #1 
On 23.06.2015 13:51, Dan Carpenter wrote:
> 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 <dan.carpenter@oracle.com>

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

Reviewed-by: Christian König <christian.koenig@amd.com>

>
> diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
> index b4b457d..4a119c2 100644
> --- a/drivers/gpu/drm/radeon/radeon_kms.c
> +++ b/drivers/gpu/drm/radeon/radeon_kms.c
> @@ -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;
Stephen Rothwell June 23, 2015, 6:19 p.m. UTC | #2 
Hi Dan,

On Tue, 23 Jun 2015 14:51:48 +0300 Dan Carpenter <dan.carpenter@oracle.com> wrote:
>
> 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).
diff mbox

Patch

diff --git a/drivers/gpu/drm/radeon/radeon_kms.c b/drivers/gpu/drm/radeon/radeon_kms.c
index b4b457d..4a119c2 100644
--- a/drivers/gpu/drm/radeon/radeon_kms.c
+++ b/drivers/gpu/drm/radeon/radeon_kms.c
@@ -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;