Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1380860

[PATCH 4/4] drivers: staging: remove BUG_ON

Show all headers | View raw

drivers/staging/android/ion/ion.c calls BUG_ON in places where WARN_ON will
suffice.

This patch replaces two such occurences. Two other occurences remain.

Signed-off-by: tcharding <me@tobin.cc>
---

Changing the remaining two BUG_ON's causes changes to the programm logic.

This is my first patch set to the kernel, I am as such, not comfortable
changeing the logic of this file at this early stage of the game. :)

 drivers/staging/android/ion/ion.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c
index 234848f..1e37f52 100644
--- a/drivers/staging/android/ion/ion.c
+++ b/drivers/staging/android/ion/ion.c
@@ -325,7 +325,7 @@ static void ion_buffer_remove_from_handle(struct ion_buffer *buffer)
 	 */
 	mutex_lock(&buffer->lock);
 	buffer->handle_count--;
-	BUG_ON(buffer->handle_count < 0);
+	WARN_ON(buffer->handle_count < 0);
 	if (!buffer->handle_count) {
 		struct task_struct *task;
 
@@ -556,7 +556,10 @@ static void ion_free_nolock(struct ion_client *client,
 {
 	bool valid_handle;
 
-	BUG_ON(client != handle->client);
+	if (client != handle->client) {
+		WARN(1, "%s: client != handle->client.\n", __func__);
+		return;
+	}
 
 	valid_handle = ion_handle_validate(client, handle);
 
@@ -569,7 +572,10 @@ static void ion_free_nolock(struct ion_client *client,
 
 void ion_free(struct ion_client *client, struct ion_handle *handle)
 {
-	BUG_ON(client != handle->client);
+	if (client != handle->client) {
+		WARN(1, "%s: client != handle->client.\n", __func__);
+		return;
+	}
 
 	mutex_lock(&client->lock);
 	ion_free_nolock(client, handle);
-- 
2.7.4

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] drivers: staging: checkpatch fixes tcharding <me@tobin.cc> - 2016-04-18 00:40 +0200
  [PATCH 4/4] drivers: staging: remove BUG_ON tcharding <me@tobin.cc> - 2016-04-18 00:40 +0200
  [PATCH 1/4] drivers: staging: fix parameter alignment tcharding <me@tobin.cc> - 2016-04-18 00:40 +0200
    Re: [PATCH 1/4] drivers: staging: fix parameter alignment Greg KH <gregkh@linuxfoundation.org> - 2016-04-18 02:00 +0200
  [PATCH 2/4] drivers: staging: fix line length tcharding <me@tobin.cc> - 2016-04-18 00:40 +0200

csiph-web