Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9fc7fdf2 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "sound: usb: Fix wrong uaudio_dbg() formatting"

parents 06183364 e9286739

drivers/dma/qcom/pci-edma.c

+3 −3
Original line number Diff line number Diff line
@@ -689,7 +689,7 @@ struct dma_async_tx_descriptor *edma_prep_dma_memcpy(struct dma_chan *chan, 
	struct edmav_dev *ev_dev = to_edmav_dev(chan);

	struct edma_desc *desc;



	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "enter\n", chan);

	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "enter\n");



	desc = edma_alloc_descriptor(ev_dev);

	if (!desc)
@@ -700,11 +700,11 @@ struct dma_async_tx_descriptor *edma_prep_dma_memcpy(struct dma_chan *chan, 
	/* insert the descriptor to client descriptor list */

	list_add_tail(&desc->node, &ev_dev->dl);



	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "exit\n", chan);

	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "exit\n");



	return &desc->tx;

err:

	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "exit with error\n", chan);

	EDMAC_VERB(ev_dev->ec_dev, ev_dev->ch_id, "exit with error\n");

	return NULL;

}

sound/usb/usb_audio_qmi_svc.c

+1 −1
Original line number Diff line number Diff line
@@ -1231,7 +1231,7 @@ static void uaudio_qmi_bye_cb(struct qmi_handle *handle, unsigned int node) 
	}



	if (svc->client_connected && svc->client_sq.sq_node == node) {

		uaudio_dbg("node:\n", node);

		uaudio_dbg("node: %u\n", node);

		queue_work(svc->uaudio_wq, &svc->qmi_disconnect_work);

		svc->client_sq.sq_node = 0;

		svc->client_sq.sq_port = 0;