summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Takahasi <claudio.takahasi@openbossa.org>2006-09-27 21:03:31 +0000
committerClaudio Takahasi <claudio.takahasi@openbossa.org>2006-09-27 21:03:31 +0000
commitd08e9842e285824257307c13195ecd7e75ead480 (patch)
tree9047854720fe2ba7de0a66a726b44c2c5f5841a0
parentb8afd64536ff4d07526b2d94697f0ff6b42f3812 (diff)
GetMinorClass must return UnsupportedMajorClass if the major class isn't "computer"
-rw-r--r--hcid/dbus-adapter.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/hcid/dbus-adapter.c b/hcid/dbus-adapter.c
index 8ceda6ed..c8ecfae4 100644
--- a/hcid/dbus-adapter.c
+++ b/hcid/dbus-adapter.c
@@ -802,14 +802,14 @@ static DBusHandlerResult handle_dev_get_minor_class_req(DBusConnection *conn, DB
hci_close_dev(dd);
+ /* FIXME: Currently, only computer major class is supported */
+ if ((cls[1] & 0x1f) != 1)
+ return error_unsupported_major_class(conn, msg);
+
reply = dbus_message_new_method_return(msg);
if (!reply)
return DBUS_HANDLER_RESULT_NEED_MEMORY;
- /* FIXME: Currently, only computer major class is supported */
- if ((cls[1] & 0x1f) != 1)
- goto failed;
-
minor_class = cls[0] >> 2;
/* Validate computer minor class */