4 files changed, 19 insertions, 9 deletions

diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c
index e6b2d085a449..b3a635b95820 100644
--- a/drivers/media/radio/radio-mr800.c
+++ b/drivers/media/radio/radio-mr800.c
@@ -99,7 +99,7 @@ devices, that would be 76 and 91.  */
 
 /*
  * Commands that device should understand
- * List isnt full and will be updated with implementation of new functions
+ * List isn't full and will be updated with implementation of new functions
  */
 #define AMRADIO_SET_FREQ        0xa4
 #define AMRADIO_SET_MUTE        0xab
diff --git a/drivers/media/radio/si4713-i2c.c b/drivers/media/radio/si4713-i2c.c
index 0fab6f8f7e24..deca2e06ff22 100644
--- a/drivers/media/radio/si4713-i2c.c
+++ b/drivers/media/radio/si4713-i2c.c
@@ -481,7 +481,7 @@ unlock:
 }
 
 /*
- * si4713_wait_stc - Waits STC interrupt and clears status bits. Usefull
+ * si4713_wait_stc - Waits STC interrupt and clears status bits. Useful
  *                   for TX_TUNE_POWER, TX_TUNE_FREQ and TX_TUNE_MEAS
  * @sdev: si4713_device structure for the device we are communicating
  * @usecs: timeout to wait for STC interrupt signal
diff --git a/drivers/media/radio/wl128x/fmdrv_common.c b/drivers/media/radio/wl128x/fmdrv_common.c
index 64454d39c0ca..5991ab60303d 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.c
+++ b/drivers/media/radio/wl128x/fmdrv_common.c
@@ -352,7 +352,7 @@ static void send_tasklet(unsigned long arg)
         if (!atomic_read(&fmdev->tx_cnt))
                 return;
 
-        /* Check, is there any timeout happenned to last transmitted packet */
+        /* Check, is there any timeout happened to last transmitted packet */
         if ((jiffies - fmdev->last_tx_jiffies) > FM_DRV_TX_TIMEOUT) {
                 fmerr("TX timeout occurred\n");
                 atomic_set(&fmdev->tx_cnt, 1);
@@ -478,7 +478,7 @@ u32 fmc_send_cmd(struct fmdev *fmdev, u8 fm_op, u16 type, void *payload,
                 return -ETIMEDOUT;
         }
         if (!fmdev->resp_skb) {
-                fmerr("Reponse SKB is missing\n");
+                fmerr("Response SKB is missing\n");
                 return -EFAULT;
         }
         spin_lock_irqsave(&fmdev->resp_skb_lock, flags);
@@ -1494,12 +1494,17 @@ u32 fmc_prepare(struct fmdev *fmdev)
         }
 
         memset(&fm_st_proto, 0, sizeof(fm_st_proto));
-        fm_st_proto.type = ST_FM;
         fm_st_proto.recv = fm_st_receive;
         fm_st_proto.match_packet = NULL;
         fm_st_proto.reg_complete_cb = fm_st_reg_comp_cb;
         fm_st_proto.write = NULL; /* TI ST driver will fill write pointer */
         fm_st_proto.priv_data = fmdev;
+        fm_st_proto.chnl_id = 0x08;
+        fm_st_proto.max_frame_size = 0xff;
+        fm_st_proto.hdr_len = 1;
+        fm_st_proto.offset_len_in_hdr = 0;
+        fm_st_proto.len_size = 1;
+        fm_st_proto.reserve = 1;
 
         ret = st_register(&fm_st_proto);
         if (ret == -EINPROGRESS) {
@@ -1532,7 +1537,7 @@ u32 fmc_prepare(struct fmdev *fmdev)
                 g_st_write = fm_st_proto.write;
         } else {
                 fmerr("Failed to get ST write func pointer\n");
-                ret = st_unregister(ST_FM);
+                ret = st_unregister(&fm_st_proto);
                 if (ret < 0)
                         fmerr("st_unregister failed %d\n", ret);
                 return -EAGAIN;
@@ -1586,13 +1591,14 @@ u32 fmc_prepare(struct fmdev *fmdev)
  */
 u32 fmc_release(struct fmdev *fmdev)
 {
+        static struct st_proto_s fm_st_proto;
         u32 ret;
 
         if (!test_bit(FM_CORE_READY, &fmdev->flag)) {
                 fmdbg("FM Core is already down\n");
                 return 0;
         }
-        /* Sevice pending read */
+        /* Service pending read */
         wake_up_interruptible(&fmdev->rx.rds.read_queue);
 
         tasklet_kill(&fmdev->tx_task);
@@ -1604,7 +1610,11 @@ u32 fmc_release(struct fmdev *fmdev)
         fmdev->resp_comp = NULL;
         fmdev->rx.freq = 0;
 
-        ret = st_unregister(ST_FM);
+        memset(&fm_st_proto, 0, sizeof(fm_st_proto));
+        fm_st_proto.chnl_id = 0x08;
+
+        ret = st_unregister(&fm_st_proto);
+
         if (ret < 0)
                 fmerr("Failed to de-register FM from ST %d\n", ret);
         else
diff --git a/drivers/media/radio/wl128x/fmdrv_common.h b/drivers/media/radio/wl128x/fmdrv_common.h
index 427c4164cece..aee243bb6630 100644
--- a/drivers/media/radio/wl128x/fmdrv_common.h
+++ b/drivers/media/radio/wl128x/fmdrv_common.h
@@ -362,7 +362,7 @@ struct fm_event_msg_hdr {
 #define FM_TX_PREEMPH_50US              0
 #define FM_TX_PREEMPH_75US              2
 
-/* FM TX antenna impedence values */
+/* FM TX antenna impedance values */
 #define FM_TX_ANT_IMP_50                0
 #define FM_TX_ANT_IMP_200               1
 #define FM_TX_ANT_IMP_500               2