diff options
| author | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:26:34 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@perex.cz> | 2010-01-08 09:26:34 +0100 |
| commit | 1cb4f624ea38361b6397966470f0a1bed5532483 (patch) | |
| tree | 418b05ddc854b09d64f7d5ee0c78875e42b5f151 /drivers/video/pxafb.c | |
| parent | 444c1953d496d272208902ff7010dc70d1f887f0 (diff) | |
| parent | 2c1f1895ef2aa8f0e5497893eff71304aef332e1 (diff) | |
| download | lwn-1cb4f624ea38361b6397966470f0a1bed5532483.tar.gz lwn-1cb4f624ea38361b6397966470f0a1bed5532483.zip | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into fixes
Diffstat (limited to 'drivers/video/pxafb.c')
| -rw-r--r-- | drivers/video/pxafb.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/pxafb.c b/drivers/video/pxafb.c index f58a3aae6ea6..825b665245bb 100644 --- a/drivers/video/pxafb.c +++ b/drivers/video/pxafb.c @@ -1223,11 +1223,12 @@ static int pxafb_smart_thread(void *arg) struct pxafb_info *fbi = arg; struct pxafb_mach_info *inf = fbi->dev->platform_data; - if (!fbi || !inf->smart_update) { + if (!inf->smart_update) { pr_err("%s: not properly initialized, thread terminated\n", __func__); return -EINVAL; } + inf = fbi->dev->platform_data; pr_debug("%s(): task starting\n", __func__); @@ -1667,7 +1668,7 @@ static int pxafb_resume(struct device *dev) return 0; } -static struct dev_pm_ops pxafb_pm_ops = { +static const struct dev_pm_ops pxafb_pm_ops = { .suspend = pxafb_suspend, .resume = pxafb_resume, }; |