Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7e9ab408 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-coverity-fixes' of git://people.freedesktop.org/~danvet/drm into drm-next 

bunch of coverity fixes all minor.

* 'drm-coverity-fixes' of git://people.freedesktop.org/~danvet/drm:
  drm: Fix error handling in drm_master_create
  drm/i2c/tda998x: Fix signed overflow issue
  drm/bochs: Remove unecessary NULL check in gem_free
  drm/bochs: Remove unnecessary NULL check in bo_unref
  drm/udl: Initialize ret in udl_driver_load
  drm/via: Remove unecessary NULL check
  drm/ast: Remove unecessary NULL check in gem_free
  drm/ast: Remove unnecessary NULL check in bo_unref
  drm/cirrus: Remove unecessary NULL check in gem_free
  drm/cirrus: Remove unnecessary NULL check in bo_unref
  drm/mgag200: Remove unecessary NULL check in gem_free
  drm/mgag200: Remove unecessary NULL check in bo_unref
parents 2c9b25c5 10e68569

drivers/gpu/drm/ast/ast_main.c

+2 −5
Original line number Diff line number Diff line
@@ -411,16 +411,13 @@ static void ast_bo_unref(struct ast_bo **bo) 


	tbo = &((*bo)->bo);

	ttm_bo_unref(&tbo);

	if (tbo == NULL)

	*bo = NULL;



}



void ast_gem_free_object(struct drm_gem_object *obj)

{

	struct ast_bo *ast_bo = gem_to_ast_bo(obj);



	if (!ast_bo)

		return;

	ast_bo_unref(&ast_bo);

}

drivers/gpu/drm/bochs/bochs_mm.c

+1 −5
Original line number Diff line number Diff line
@@ -434,17 +434,13 @@ static void bochs_bo_unref(struct bochs_bo **bo) 


	tbo = &((*bo)->bo);

	ttm_bo_unref(&tbo);

	if (tbo == NULL)

	*bo = NULL;



}



void bochs_gem_free_object(struct drm_gem_object *obj)

{

	struct bochs_bo *bochs_bo = gem_to_bochs_bo(obj);



	if (!bochs_bo)

		return;

	bochs_bo_unref(&bochs_bo);

}

drivers/gpu/drm/cirrus/cirrus_main.c

+1 −5
Original line number Diff line number Diff line
@@ -264,17 +264,13 @@ static void cirrus_bo_unref(struct cirrus_bo **bo) 


	tbo = &((*bo)->bo);

	ttm_bo_unref(&tbo);

	if (tbo == NULL)

	*bo = NULL;



}



void cirrus_gem_free_object(struct drm_gem_object *obj)

{

	struct cirrus_bo *cirrus_bo = gem_to_cirrus_bo(obj);



	if (!cirrus_bo)

		return;

	cirrus_bo_unref(&cirrus_bo);

}

drivers/gpu/drm/drm_stub.c

+4 −1
Original line number Diff line number Diff line
@@ -128,7 +128,10 @@ struct drm_master *drm_master_create(struct drm_minor *minor) 
	kref_init(&master->refcount);

	spin_lock_init(&master->lock.spinlock);

	init_waitqueue_head(&master->lock.lock_queue);

	drm_ht_create(&master->magiclist, DRM_MAGIC_HASH_ORDER);

	if (drm_ht_create(&master->magiclist, DRM_MAGIC_HASH_ORDER)) {

		kfree(master);

		return NULL;

	}

	INIT_LIST_HEAD(&master->magicfree);

	master->minor = minor;

drivers/gpu/drm/i2c/tda998x_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -568,11 +568,11 @@ static irqreturn_t tda998x_irq_thread(int irq, void *data) 


static uint8_t tda998x_cksum(uint8_t *buf, size_t bytes)

{

	uint8_t sum = 0;

	int sum = 0;



	while (bytes--)

		sum += *buf++;

	return (255 - sum) + 1;

		sum -= *buf++;

	return sum;

}



#define HB(x) (x)