Merge tag 'driver-core-4.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git...

[karo-tx-linux.git] / drivers / media / radio / radio-wl1273.c

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index 7240223dc15abae5a9dd00cf6662beaec8e2f196..17e82a9a01099bf6cc5f01b2ce4ab08a0f6b23a8 100644 (file)
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -610,10 +610,21 @@ static int wl1273_fm_start(struct wl1273_device *radio, int new_mode)
                        }
                }
 
-               if (radio->rds_on)
+               if (radio->rds_on) {
                        r = core->write(core, WL1273_RDS_DATA_ENB, 1);
-               else
+                       if (r) {
+                               dev_err(dev, "%s: RDS_DATA_ENB ON fails\n",
+                                       __func__);
+                               goto fail;
+                       }
+               } else {
                        r = core->write(core, WL1273_RDS_DATA_ENB, 0);
+                       if (r) {
+                               dev_err(dev, "%s: RDS_DATA_ENB OFF fails\n",
+                                       __func__);
+                               goto fail;
+                       }
+               }
        } else {
                dev_warn(dev, "%s: Illegal mode.\n", __func__);
        }