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

Commit 6ba7a67f 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: Removed reference to user provided pointer."

parents 104e7783 77128efd

drivers/media/radio/radio-iris.c

+8 −4
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ struct iris_device { 


	struct radio_hci_dev *fm_hdev;



	struct v4l2_capability *g_cap;

	struct v4l2_capability g_cap;

	struct v4l2_control *g_ctl;



	struct hci_fm_mute_mode_req mute_mode;
@@ -2027,7 +2027,7 @@ static void hci_cc_feature_list_rsp(struct radio_hci_dev *hdev, 
	}



	rsp = (struct hci_fm_feature_list_rsp  *)skb->data;

	v4l_cap = radio->g_cap;

	v4l_cap = &radio->g_cap;



	if (!rsp->status)

		v4l_cap->capabilities = (rsp->feature_mask & 0x000002) |
@@ -4633,8 +4633,12 @@ static int iris_vidioc_querycap(struct file *file, void *priv, 
	}

	strlcpy(capability->driver, DRIVER_NAME, sizeof(capability->driver));

	strlcpy(capability->card, DRIVER_CARD, sizeof(capability->card));

	capability->capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	radio->g_cap = capability;



	strlcpy(radio->g_cap.driver, DRIVER_NAME, sizeof(radio->g_cap.driver));

	strlcpy(radio->g_cap.card, DRIVER_CARD, sizeof(radio->g_cap.card));



	radio->g_cap.capabilities = V4L2_CAP_TUNER | V4L2_CAP_RADIO;

	capability->capabilities = radio->g_cap.capabilities;

	return 0;

}