diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:42:09 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-04 18:42:09 -0400 |
| commit | 999fd1ab344dabd9c985b638bf4c29495b8e4619 (patch) | |
| tree | b4a238aafc79caa085e469ee28ab61301ca17f8f /drivers/video | |
| parent | 9a9620db07b27700a4de9e86985735fffb78e2f8 (diff) | |
| parent | ac422f9443191e050c16fe99baeb5c3d74934589 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/lethal/sh-2.6: (23 commits)
sh: Make intc messages consistent via pr_fmt.
sh: make sure static declaration on ms7724se
sh: make sure static declaration on mach-migor
sh: make sure static declaration on mach-ecovec24
sh: make sure static declaration on mach-ap325rxa
clocksource: sh_cmt: compute mult and shift before registration
clocksource: sh_tmu: compute mult and shift before registration
sh: PIO disabling for x3proto and urquell.
sh: mach-sdk7786: conditionally disable PIO support.
sh: support for platforms without PIO.
usb: r8a66597-hcd pio to mmio accessor conversion.
usb: gadget: r8a66597-udc pio to mmio accessor conversion.
usb: gadget: m66592-udc pio to mmio accessor conversion.
sh: add romImage MMCIF boot for sh7724 and Ecovec V2
sh: add boot code to MMCIF driver header
sh: prepare MMCIF driver header file
sh: allow romImage data between head.S and the zero page
sh: Add support MMCIF for ecovec
sh: remove duplicated #include
input: serio: disable i8042 for non-cayman sh platforms.
...
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/sh_mobile_lcdcfb.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/video/sh_mobile_lcdcfb.c b/drivers/video/sh_mobile_lcdcfb.c index e8c769944812..12c451a711e9 100644 --- a/drivers/video/sh_mobile_lcdcfb.c +++ b/drivers/video/sh_mobile_lcdcfb.c | |||
| @@ -991,13 +991,13 @@ static int __devinit sh_mobile_lcdc_probe(struct platform_device *pdev) | |||
| 991 | priv->ch[j].lcdc = priv; | 991 | priv->ch[j].lcdc = priv; |
| 992 | memcpy(&priv->ch[j].cfg, &pdata->ch[i], sizeof(pdata->ch[i])); | 992 | memcpy(&priv->ch[j].cfg, &pdata->ch[i], sizeof(pdata->ch[i])); |
| 993 | 993 | ||
| 994 | error = sh_mobile_lcdc_check_interface(&priv->ch[i]); | 994 | error = sh_mobile_lcdc_check_interface(&priv->ch[j]); |
| 995 | if (error) { | 995 | if (error) { |
| 996 | dev_err(&pdev->dev, "unsupported interface type\n"); | 996 | dev_err(&pdev->dev, "unsupported interface type\n"); |
| 997 | goto err1; | 997 | goto err1; |
| 998 | } | 998 | } |
| 999 | init_waitqueue_head(&priv->ch[i].frame_end_wait); | 999 | init_waitqueue_head(&priv->ch[j].frame_end_wait); |
| 1000 | init_completion(&priv->ch[i].vsync_completion); | 1000 | init_completion(&priv->ch[j].vsync_completion); |
| 1001 | priv->ch[j].pan_offset = 0; | 1001 | priv->ch[j].pan_offset = 0; |
| 1002 | 1002 | ||
| 1003 | switch (pdata->ch[i].chan) { | 1003 | switch (pdata->ch[i].chan) { |