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

Commit 212f9fef authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "radio-iris: Serialize the call to fm_ops_release function"

parents 95766ee4 cb37879a

drivers/media/radio/radio-iris-transport.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static void send_disable_event(struct work_struct *worker) 


static void radio_hci_smd_notify_cmd(void *data, unsigned int event)

{

	struct radio_hci_dev *hdev = hs.hdev;

	struct radio_hci_dev *hdev = (struct radio_hci_dev *)data;

	FMDBG("data %p event %u", data, event);



	if (!hdev) {

drivers/media/radio/radio-iris.c

+5 −0
Original line number Diff line number Diff line
@@ -5212,6 +5212,8 @@ static int iris_fops_release(struct file *file) 
		return -EINVAL;



	FMDBG("state %d", radio->mode);

	mutex_lock(&radio->lock);



	if (radio->mode == FM_OFF)

		goto END;
@@ -5231,6 +5233,7 @@ static int iris_fops_release(struct file *file) 
		radio->is_fm_closing = false;

	} else if (radio->mode == FM_CALIB) {

		radio->mode = FM_OFF;

		mutex_unlock(&radio->lock);

		return retval;

	}

END:
@@ -5240,6 +5243,8 @@ END: 
		radio->fm_hdev->close_smd();

	mutex_unlock(&fm_smd_enable);



	mutex_unlock(&radio->lock);



	if (retval < 0)

		FMDERR("Err on disable FM %d\n", retval);