commit 6cc0e32a30b04ecb0376c99c5f97f06956feb537
author Srinivasa Rao Uppala <uppalas@codeaurora.org> Fri Aug 12 10:54:48 2011 -0700
committer Bryan Huntsman <bryanh@codeaurora.org> Mon Oct 03 16:14:45 2011 -0700
tree e7c633f52e6b0684096e9222ce0060f96018de69
parent 1833754d1f71e8b52e3ac0fcfb4602048763f39c

radio: iris: Fixed the ssbi riva poke issue

This patch adds the proper command type for riva poke

Signed-off-by: Srinivasa Rao Uppala <uppalas@codeaurora.org>

drivers/media/radio/radio-iris.c

diff --git a/drivers/media/radio/radio-iris.c b/drivers/media/radio/radio-iris.c
index f57b5e8..2194b48 100644
--- a/drivers/media/radio/radio-iris.c
+++ b/drivers/media/radio/radio-iris.c
@@ -842,7 +842,7 @@
 	__u16 opcode = 0;
 	struct hci_fm_riva_poke *poke_data = (struct hci_fm_riva_poke *) param;
 
-	opcode = hci_opcode_pack(HCI_OGF_FM_RECV_CTRL_CMD_REQ,
+	opcode = hci_opcode_pack(HCI_OGF_FM_DIAGNOSTIC_CMD_REQ,
 		HCI_OCF_FM_POKE_DATA);
 	return radio_hci_send_cmd(hdev, opcode, sizeof((*poke_data)),
 	poke_data);
@@ -2409,7 +2409,7 @@
 		int kfifo_alloc_rc = 0;
 		spin_lock_init(&radio->buf_lock[i]);
 
-		if ((i == IRIS_BUF_RAW_RDS) | (i == IRIS_BUF_PEEK))
+		if ((i == IRIS_BUF_RAW_RDS) || (i == IRIS_BUF_PEEK))
 			kfifo_alloc_rc = kfifo_alloc(&radio->data_buf[i],
 				rds_buf*3, GFP_KERNEL);
 		else