projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
[cascardo/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
46cacf8
..
e2550dc
100644
(file)
--- a/
drivers/media/radio/radio-wl1273.c
+++ b/
drivers/media/radio/radio-wl1273.c
@@
-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 =
pdev->dev.platform_data
;
+ struct wl1273_core **core =
mfd_get_data(pdev)
;
struct wl1273_device *radio;
struct v4l2_ctrl *ctrl;
int r = 0;