Merge branch 'for-linus' of master.kernel.org:/home/rmk/linux-2.6-arm

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / media / radio / radio-wl1273.c

diff --git a/drivers/media/radio/radio-wl1273.c b/drivers/media/radio/radio-wl1273.c
index e2550dc2944f939812805d2c23778c86df2ff7e0..459f7272d32634d67143ee679a5375fc85f37f99 100644 (file)
--- a/drivers/media/radio/radio-wl1273.c
+++ b/drivers/media/radio/radio-wl1273.c
@@ -1382,7 +1382,7 @@ static int wl1273_fm_g_volatile_ctrl(struct v4l2_ctrl *ctrl)
 
        switch (ctrl->id) {
        case  V4L2_CID_TUNE_ANTENNA_CAPACITOR:
-               ctrl->val = wl1273_fm_get_tx_ctune(radio);
+               ctrl->cur.val = wl1273_fm_get_tx_ctune(radio);
                break;
 
        default:
@@ -1990,7 +1990,7 @@ static int wl1273_fm_radio_remove(struct platform_device *pdev)
 
 static int __devinit wl1273_fm_radio_probe(struct platform_device *pdev)
 {
-       struct wl1273_core **core = mfd_get_data(pdev);
+       struct wl1273_core **core = pdev->dev.platform_data;
        struct wl1273_device *radio;
        struct v4l2_ctrl *ctrl;
        int r = 0;