diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-07-21 17:59:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-07-21 18:00:01 +0200 |
| commit | 994bf1c92270e3d7731ea08f1d1bd7a668314e60 (patch) | |
| tree | 4409a21eab486e53fbe350a66e8a4f28b7a720c0 /drivers/media/video/mx1_camera.c | |
| parent | bd96efe17d945f0bad56d592f8686dc6309905e7 (diff) | |
| parent | cf6ace16a3cd8b728fb0afa68368fd40bbeae19f (diff) | |
Merge branch 'linus' into sched/core
Merge reason: pick up the latest scheduler fixes.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/media/video/mx1_camera.c')
| -rw-r--r-- | drivers/media/video/mx1_camera.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/media/video/mx1_camera.c b/drivers/media/video/mx1_camera.c index bc0c23a1009..63f8a0cc33d 100644 --- a/drivers/media/video/mx1_camera.c +++ b/drivers/media/video/mx1_camera.c @@ -444,12 +444,9 @@ static int mx1_camera_add_device(struct soc_camera_device *icd) { struct soc_camera_host *ici = to_soc_camera_host(icd->dev.parent); struct mx1_camera_dev *pcdev = ici->priv; - int ret; - if (pcdev->icd) { - ret = -EBUSY; - goto ebusy; - } + if (pcdev->icd) + return -EBUSY; dev_info(icd->dev.parent, "MX1 Camera driver attached to camera %d\n", icd->devnum); @@ -458,8 +455,7 @@ static int mx1_camera_add_device(struct soc_camera_device *icd) pcdev->icd = icd; -ebusy: - return ret; + return 0; } static void mx1_camera_remove_device(struct soc_camera_device *icd) |