git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drivers: msm: video: add dev_set_name call
[pandora-kernel.git]
/
drivers
/
video
/
msm
/
mdp.c
diff --git
a/drivers/video/msm/mdp.c
b/drivers/video/msm/mdp.c
index
19c01c6
..
c3636d5
100644
(file)
--- a/
drivers/video/msm/mdp.c
+++ b/
drivers/video/msm/mdp.c
@@
-90,7
+90,7
@@
static int locked_disable_mdp_irq(struct mdp_info *mdp, uint32_t mask)
mdp_irq_mask &= ~(mask);
/* if no one is waiting on the interrupt, disable it */
if (!mdp_irq_mask) {
mdp_irq_mask &= ~(mask);
/* if no one is waiting on the interrupt, disable it */
if (!mdp_irq_mask) {
- disable_irq(mdp->irq);
+ disable_irq
_nosync
(mdp->irq);
if (clk)
clk_disable(clk);
}
if (clk)
clk_disable(clk);
}
@@
-258,7
+258,6
@@
int get_img(struct mdp_img *img, struct fb_info *info,
{
int put_needed, ret = 0;
struct file *file;
{
int put_needed, ret = 0;
struct file *file;
- unsigned long vstart;
file = fget_light(img->memory_id, &put_needed);
if (file == NULL)
file = fget_light(img->memory_id, &put_needed);
if (file == NULL)
@@
-483,6
+482,7
@@
int mdp_probe(struct platform_device *pdev)
/* register mdp device */
mdp->mdp_dev.dev.parent = &pdev->dev;
mdp->mdp_dev.dev.class = mdp_class;
/* register mdp device */
mdp->mdp_dev.dev.parent = &pdev->dev;
mdp->mdp_dev.dev.class = mdp_class;
+ dev_set_name(&mdp->mdp_dev.dev, "mdp%d", pdev->id);
/* if you can remove the platform device you'd have to implement
* this:
/* if you can remove the platform device you'd have to implement
* this: