colin/ModemManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kernel-device: return G_MAXUINT when get_property_as_int_hex() fails

Browse Source
This commit is contained in:
Aleksander Morgado
2016-11-07 19:46:40 +01:00
parent 820ab01ddf
commit 64b4afa960
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/kerneldevice/mm-kernel-device-generic.c
View File

@@ -880,7 +880,7 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *self,
const gchar *value;
guint aux = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), -1);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_GENERIC (self), G_MAXUINT);
value = g_object_get_data (G_OBJECT (self), property);
return ((value && mm_get_uint_from_hex_str (value, &aux)) ? aux : 0);

4
src/kerneldevice/mm-kernel-device-udev.c
View File

@@ -587,12 +587,12 @@ kernel_device_get_property_as_int_hex (MMKernelDevice *_self,
const gchar *s;
guint out = 0;
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), -1);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE_UDEV (_self), G_MAXUINT);
self = MM_KERNEL_DEVICE_UDEV (_self);
if (!self->priv->device)
return -1;
return G_MAXUINT;
s = g_udev_device_get_property (self->priv->device, property);
return ((s && mm_get_uint_from_hex_str (s, &out)) ? out : 0);