[PATCH BlueZ 1/2] input/hog: Cleanup unnecessary code

[PATCH BlueZ 1/2] input/hog: Cleanup unnecessary code

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

The callback register by bt_uhid_register already contains the event type
so there is no need to check for it again.
---
 profiles/input/hog.c | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/profiles/input/hog.c b/profiles/input/hog.c
index 491f933..df2b30b 100644
--- a/profiles/input/hog.c
+++ b/profiles/input/hog.c
@@ -340,9 +340,6 @@ static void forward_report(struct uhid_event *ev, void *user_data)
 		size = ev->u.output.size;
 	}
 
-	if (ev->type != UHID_OUTPUT)
-		return;
-
 	type = HOG_REPORT_TYPE_OUTPUT;
 
 	l = g_slist_find_custom(hogdev->reports, GUINT_TO_POINTER(type),
-- 
1.9.3

[PATCH BlueZ 2/2] android/hog: Fix handling UHID_FEATURE as UHID_OUTPUT

[Luiz Augusto von Dentz]

From: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>

As with input plugin this code contain the same issue handling
UHID_FEATURE events can cause a crash.
---
 android/hog.c | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/android/hog.c b/android/hog.c
index 9f8c7e5..ef5690c 100644
--- a/android/hog.c
+++ b/android/hog.c
@@ -404,16 +404,7 @@ static void forward_report(struct uhid_event *ev, void *user_data)
 		size = ev->u.output.size;
 	}
 
-	switch (ev->type) {
-	case UHID_OUTPUT:
-		type = HOG_REPORT_TYPE_OUTPUT;
-		break;
-	case UHID_FEATURE:
-		type = HOG_REPORT_TYPE_FEATURE;
-		break;
-	default:
-		return;
-	}
+	type = HOG_REPORT_TYPE_OUTPUT;
 
 	l = g_slist_find_custom(hog->reports, GUINT_TO_POINTER(type),
 							report_type_cmp);
@@ -573,7 +564,6 @@ static void report_map_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
 	}
 
 	bt_uhid_register(hog->uhid, UHID_OUTPUT, forward_report, hog);
-	bt_uhid_register(hog->uhid, UHID_FEATURE, forward_report, hog);
 }
 
 static void info_read_cb(guint8 status, const guint8 *pdu, guint16 plen,
-- 
1.9.3

Re: [PATCH BlueZ 1/2] input/hog: Cleanup unnecessary code

[Johan Hedberg]

Hi Luiz,

On Mon, Jul 28, 2014, Luiz Augusto von Dentz wrote:
> The callback register by bt_uhid_register already contains the event type
> so there is no need to check for it again.
> ---
>  profiles/input/hog.c | 3 ---
>  1 file changed, 3 deletions(-)

Both patches have been applied. Thanks.

Johan