UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm 

* 'msm-video' of git://codeaurora.org/quic/kernel/dwalker/linux-msm:
  video: msm: Fix section mismatch in mddi.c.
  drivers: video: msm: drop some unused variables
This commit is contained in:
Linus Torvalds 2010-08-11 09:18:06 -07:00
parent 946880fa27 461cbe77d0
commit 84479f3c17
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/msm/mddi.c
View File

@ -187,10 +187,8 @@ static void mddi_wait_interrupt(struct mddi_info *mddi, uint32_t intmask);
static void mddi_handle_rev_data_avail(struct mddi_info *mddi) static void mddi_handle_rev_data_avail(struct mddi_info *mddi)
{ {
union mddi_rev *rev = mddi->rev_data;
uint32_t rev_data_count; uint32_t rev_data_count;
uint32_t rev_crc_err_count; uint32_t rev_crc_err_count;
int i;
struct reg_read_info *ri; struct reg_read_info *ri;
size_t prev_offset; size_t prev_offset;
uint16_t length; uint16_t length;
@ -670,7 +668,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi)
return 0; return 0;
} }
static int __init mddi_probe(struct platform_device *pdev) static int __devinit mddi_probe(struct platform_device *pdev)
{ {
struct msm_mddi_platform_data *pdata = pdev->dev.platform_data; struct msm_mddi_platform_data *pdata = pdev->dev.platform_data;
struct mddi_info *mddi = &mddi_info[pdev->id]; struct mddi_info *mddi = &mddi_info[pdev->id];

1
drivers/video/msm/mdp.c
View File

@ -258,7 +258,6 @@ int get_img(struct mdp_img *img, struct fb_info *info,
{ {
int put_needed, ret = 0; int put_needed, ret = 0;
struct file *file; struct file *file;
unsigned long vstart;
file = fget_light(img->memory_id, &put_needed); file = fget_light(img->memory_id, &put_needed);
if (file == NULL) if (file == NULL)