Commit 84479f3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 946880fa 461cbe77

drivers/video/msm/mddi.c

+1 −3
Original line number Diff line number Diff line
@@ -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)

{

	union mddi_rev *rev = mddi->rev_data;

	uint32_t rev_data_count;

	uint32_t rev_crc_err_count;

	int i;

	struct reg_read_info *ri;

	size_t prev_offset;

	uint16_t length;
@@ -670,7 +668,7 @@ static int __init mddi_rev_data_setup(struct mddi_info *mddi) 
	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 mddi_info *mddi = &mddi_info[pdev->id];

drivers/video/msm/mdp.c

+0 −1
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ int get_img(struct mdp_img *img, struct fb_info *info, 
{

	int put_needed, ret = 0;

	struct file *file;

	unsigned long vstart;



	file = fget_light(img->memory_id, &put_needed);

	if (file == NULL)