Merge "msm_serial_hs: modify uart driver to prevent race between timer calls"

	hex_dump_ipc(msm_uport, tx->ipc_tx_ctxt, "Tx",

			&tx_buf->buf[tx_buf->tail], (u64)src_addr, tx_count);

	sps_pipe_handle = tx->cons.pipe_handle;

	/* Queue transfer request to SPS */

	ret = sps_transfer_one(sps_pipe_handle, src_addr, tx_count,

				msm_uport, flags);

	/* Set 1 second timeout */

	mod_timer(&tx->tx_timeout_timer,

		jiffies + msecs_to_jiffies(MSEC_PER_SEC));

	/* Queue transfer request to SPS */

	ret = sps_transfer_one(sps_pipe_handle, src_addr, tx_count,

				msm_uport, flags);

	MSM_HS_DBG("%s:Enqueue Tx Cmd, ret %d\n", __func__, ret);

}