Merge tag 'mac80211-next-for-john-2014-11-04' of git://git.kernel.org/pub/scm/linux...

[cascardo/linux.git] / drivers / media / radio / wl128x / fmdrv_tx.c

diff --git a/drivers/media/radio/wl128x/fmdrv_tx.c b/drivers/media/radio/wl128x/fmdrv_tx.c
index 6ea33e0..839970b 100644 (file)
--- a/drivers/media/radio/wl128x/fmdrv_tx.c
+++ b/drivers/media/radio/wl128x/fmdrv_tx.c
@@ -374,7 +374,7 @@ int fm_tx_get_tune_cap_val(struct fmdev *fmdev)
        if (ret < 0)
                return ret;
 
-       curr_val = be16_to_cpu(curr_val);
+       curr_val = be16_to_cpu((__force __be16)curr_val);
 
        return curr_val;
 }