diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-02 06:16:20 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-01-02 06:16:20 -0500 |
| commit | 1df4bb4af42459a4a10e7b21794a6f44463534e6 (patch) | |
| tree | dcea2c5f7035a5fc2304b25614d7fa12fe073c58 /drivers | |
| parent | cd6e125c58ae1561bedb6ea6f70b00d6c2599d62 (diff) | |
| parent | 91a86a964f0773fdf466fe02577c8494ca8e2083 (diff) | |
Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/pxafb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index 415858b421b3..825b665245bb 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c | |||
| @@ -1221,9 +1221,9 @@ static void setup_smart_timing(struct pxafb_info *fbi, | |||
| 1221 | static int pxafb_smart_thread(void *arg) | 1221 | static int pxafb_smart_thread(void *arg) |
| 1222 | { | 1222 | { |
| 1223 | struct pxafb_info *fbi = arg; | 1223 | struct pxafb_info *fbi = arg; |
| 1224 | struct pxafb_mach_info *inf; | 1224 | struct pxafb_mach_info *inf = fbi->dev->platform_data; |
| 1225 | 1225 | ||
| 1226 | if (!fbi || !fbi->dev->platform_data->smart_update) { | 1226 | if (!inf->smart_update) { |
| 1227 | pr_err("%s: not properly initialized, thread terminated\n", | 1227 | pr_err("%s: not properly initialized, thread terminated\n", |
| 1228 | __func__); | 1228 | __func__); |
| 1229 | return -EINVAL; | 1229 | return -EINVAL; |