aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mm-base-modem.c7
-rw-r--r--src/mm-port-serial.c3
2 files changed, 6 insertions, 4 deletions
diff --git a/src/mm-base-modem.c b/src/mm-base-modem.c
index cb044419..bb9abb55 100644
--- a/src/mm-base-modem.c
+++ b/src/mm-base-modem.c
@@ -151,7 +151,6 @@ mm_base_modem_grab_port (MMBaseModem *self,
gchar *key;
const gchar *subsys;
const gchar *name;
- const gchar *flow_control_tag;
g_return_val_if_fail (MM_IS_BASE_MODEM (self), FALSE);
g_return_val_if_fail (MM_IS_KERNEL_DEVICE (kernel_device), FALSE);
@@ -200,6 +199,8 @@ mm_base_modem_grab_port (MMBaseModem *self,
}
/* Serial ports... */
else if (g_str_equal (subsys, "tty")) {
+ const gchar *flow_control_tag;
+
if (ptype == MM_PORT_TYPE_QCDM)
/* QCDM port */
port = MM_PORT (mm_port_serial_qcdm_new (name));
@@ -252,8 +253,8 @@ mm_base_modem_grab_port (MMBaseModem *self,
g_object_set (port,
MM_PORT_SERIAL_BAUD, mm_kernel_device_get_property_as_int (kernel_device, "ID_MM_TTY_BAUDRATE"),
NULL);
- flow_control_tag = mm_kernel_device_get_property (kernel_device,
- "ID_MM_TTY_FLOW_CONTROL");
+
+ flow_control_tag = mm_kernel_device_get_property (kernel_device, "ID_MM_TTY_FLOW_CONTROL");
if (flow_control_tag)
g_object_set (port,
MM_PORT_SERIAL_FLOW_CONTROL,
diff --git a/src/mm-port-serial.c b/src/mm-port-serial.c
index cbe527b3..d43ea0a0 100644
--- a/src/mm-port-serial.c
+++ b/src/mm-port-serial.c
@@ -1862,7 +1862,8 @@ mm_port_serial_set_flow_control (MMPortSerial *self,
return internal_tcsetattr (self, self->priv->fd, &options, error);
}
-MMFlowControl mm_port_serial_get_flow_control (MMPortSerial *self)
+MMFlowControl
+mm_port_serial_get_flow_control (MMPortSerial *self)
{
return self->priv->flow_control;
}