summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Miao <eric.y.miao@gmail.com>2009-12-26 16:25:18 +0800
committerEric Miao <eric.y.miao@gmail.com>2009-12-29 14:11:27 +0800
commitda2c3f0ead336c04b4d1ad36ff42d8d264f44f65 (patch)
tree39c1ade5fc4d9c65338e4c8c0b4a94246735dc5b
parent6b7b284958d47b77d06745b36bc7f36dab769d9b (diff)
downloadlinux-da2c3f0ead336c04b4d1ad36ff42d8d264f44f65.tar.gz
linux-da2c3f0ead336c04b4d1ad36ff42d8d264f44f65.tar.bz2
linux-da2c3f0ead336c04b4d1ad36ff42d8d264f44f65.zip
[ARM] pxafb: fix building issue of incorrect reference
Commit "d2a34c1 drivers/video: Move dereference after NULL test" introduced a build error of "fbi->dev->platform_data->smart_update" being unknown type to the compiler, fix this by removing the unnecessary test of 'fbi'. Cc: Julia Lawall <julia@diku.dk> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
-rw-r--r--drivers/video/pxafb.c4
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,
static int pxafb_smart_thread(void *arg)
{
struct pxafb_info *fbi = arg;
- struct pxafb_mach_info *inf;
+ struct pxafb_mach_info *inf = fbi->dev->platform_data;
- if (!fbi || !fbi->dev->platform_data->smart_update) {
+ if (!inf->smart_update) {
pr_err("%s: not properly initialized, thread terminated\n",
__func__);
return -EINVAL;