Prev: char: mxser: call disable_pci_device() if pci_probe() failed
Next: batman-adv: design suggestions
From: Daniel Walker on 9 Aug 2010 16:30
Hi Linus,

Please pull a couple of trial fixes for the MSM video driver.

Thanks!

The following changes since commit 7e27d6e778cd87b6f2415515d7127eba53fe5d02:

Linux 2.6.35-rc3 (2010-06-11 19:14:04 -0700)

are available in the git repository at:
git://codeaurora.org/quic/kernel/dwalker/linux-msm.git msm-video

Daniel Walker (1):
drivers: video: msm: drop some unused variables

Gregory Bean (1):
video: msm: Fix section mismatch in mddi.c.

drivers/video/msm/mddi.c | 4 +---
drivers/video/msm/mdp.c | 1 -
2 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/drivers/video/msm/mddi.c b/drivers/video/msm/mddi.c
index c1ff271..7c316c3 100644
--- a/drivers/video/msm/mddi.c
+++ b/drivers/video/msm/mddi.c
@@ -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];
diff --git a/drivers/video/msm/mdp.c b/drivers/video/msm/mdp.c
index 19c01c6..3c28db0 100644
--- a/drivers/video/msm/mdp.c
+++ b/drivers/video/msm/mdp.c
@@ -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)

--
Sent by an consultant of the Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum.

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: char: mxser: call disable_pci_device() if pci_probe() failed
Next: batman-adv: design suggestions