diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-11-07 08:46:07 +0100 |
| commit | 8bf5ff37ec43c9afcf8a352754624f6462c06a02 (patch) | |
| tree | c407189bc8a36c3b5d452a13692037949858e7f2 /linux/drivers/media/video/sh_mobile_ceu_camera.c | |
| parent | 4c6dca7b19e1055dd0d4aaa8123c9a832f117202 (diff) | |
| parent | 17490135b2a7a46fc7fb67d64dbaeb1301ea169d (diff) | |
| download | mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.gz mediapointer-dvb-s2-8bf5ff37ec43c9afcf8a352754624f6462c06a02.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'linux/drivers/media/video/sh_mobile_ceu_camera.c')
| -rw-r--r-- | linux/drivers/media/video/sh_mobile_ceu_camera.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/linux/drivers/media/video/sh_mobile_ceu_camera.c b/linux/drivers/media/video/sh_mobile_ceu_camera.c index 2407607f2..2fb8bee0b 100644 --- a/linux/drivers/media/video/sh_mobile_ceu_camera.c +++ b/linux/drivers/media/video/sh_mobile_ceu_camera.c @@ -37,6 +37,7 @@ #include <media/soc_camera.h> #include <media/sh_mobile_ceu.h> #include <media/videobuf-dma-contig.h> +#include "compat.h" /* register offsets for sh7722 / sh7723 */ @@ -609,7 +610,7 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev) /* request irq */ err = request_irq(pcdev->irq, sh_mobile_ceu_irq, IRQF_DISABLED, - pdev->dev.bus_id, pcdev); + dev_name(&pdev->dev), pcdev); if (err) { dev_err(&pdev->dev, "Unable to register CEU interrupt.\n"); goto exit_release_mem; @@ -618,8 +619,8 @@ static int sh_mobile_ceu_probe(struct platform_device *pdev) pcdev->ici.priv = pcdev; pcdev->ici.dev.parent = &pdev->dev; pcdev->ici.nr = pdev->id; - pcdev->ici.drv_name = pdev->dev.bus_id, - pcdev->ici.ops = &sh_mobile_ceu_host_ops, + pcdev->ici.drv_name = dev_name(&pdev->dev); + pcdev->ici.ops = &sh_mobile_ceu_host_ops; err = soc_camera_host_register(&pcdev->ici); if (err) |