diff options
Diffstat (limited to 'drivers/media/video')
-rw-r--r-- | drivers/media/video/cx18/cx18-alsa-main.c | 1 | ||||
-rw-r--r-- | drivers/media/video/davinci/dm355_ccdc.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ivtv/ivtvfb.c | 2 | ||||
-rw-r--r-- | drivers/media/video/ov6650.c | 2 | ||||
-rw-r--r-- | drivers/media/video/s5p-fimc/fimc-mdevice.c | 5 | ||||
-rw-r--r-- | drivers/media/video/s5p-tv/mixer_video.c | 1 |
6 files changed, 3 insertions, 10 deletions
diff --git a/drivers/media/video/cx18/cx18-alsa-main.c b/drivers/media/video/cx18/cx18-alsa-main.c index a1e6c2a32478..e118361c2e7b 100644 --- a/drivers/media/video/cx18/cx18-alsa-main.c +++ b/drivers/media/video/cx18/cx18-alsa-main.c | |||
@@ -285,7 +285,6 @@ static void __exit cx18_alsa_exit(void) | |||
285 | 285 | ||
286 | drv = driver_find("cx18", &pci_bus_type); | 286 | drv = driver_find("cx18", &pci_bus_type); |
287 | ret = driver_for_each_device(drv, NULL, NULL, cx18_alsa_exit_callback); | 287 | ret = driver_for_each_device(drv, NULL, NULL, cx18_alsa_exit_callback); |
288 | put_driver(drv); | ||
289 | 288 | ||
290 | cx18_ext_init = NULL; | 289 | cx18_ext_init = NULL; |
291 | printk(KERN_INFO "cx18-alsa: module unload complete\n"); | 290 | printk(KERN_INFO "cx18-alsa: module unload complete\n"); |
diff --git a/drivers/media/video/davinci/dm355_ccdc.c b/drivers/media/video/davinci/dm355_ccdc.c index f83baf3a52b0..5b68847d4017 100644 --- a/drivers/media/video/davinci/dm355_ccdc.c +++ b/drivers/media/video/davinci/dm355_ccdc.c | |||
@@ -292,7 +292,7 @@ static int validate_ccdc_param(struct ccdc_config_params_raw *ccdcparam) | |||
292 | if ((ccdcparam->med_filt_thres < 0) || | 292 | if ((ccdcparam->med_filt_thres < 0) || |
293 | (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { | 293 | (ccdcparam->med_filt_thres > CCDC_MED_FILT_THRESH)) { |
294 | dev_dbg(ccdc_cfg.dev, | 294 | dev_dbg(ccdc_cfg.dev, |
295 | "Invalid value of median filter thresold\n"); | 295 | "Invalid value of median filter threshold\n"); |
296 | return -EINVAL; | 296 | return -EINVAL; |
297 | } | 297 | } |
298 | 298 | ||
diff --git a/drivers/media/video/ivtv/ivtvfb.c b/drivers/media/video/ivtv/ivtvfb.c index d0fbfcf7133d..e5e7fa9e737b 100644 --- a/drivers/media/video/ivtv/ivtvfb.c +++ b/drivers/media/video/ivtv/ivtvfb.c | |||
@@ -1293,7 +1293,6 @@ static int __init ivtvfb_init(void) | |||
1293 | 1293 | ||
1294 | drv = driver_find("ivtv", &pci_bus_type); | 1294 | drv = driver_find("ivtv", &pci_bus_type); |
1295 | err = driver_for_each_device(drv, NULL, ®istered, ivtvfb_callback_init); | 1295 | err = driver_for_each_device(drv, NULL, ®istered, ivtvfb_callback_init); |
1296 | put_driver(drv); | ||
1297 | if (!registered) { | 1296 | if (!registered) { |
1298 | printk(KERN_ERR "ivtvfb: no cards found\n"); | 1297 | printk(KERN_ERR "ivtvfb: no cards found\n"); |
1299 | return -ENODEV; | 1298 | return -ENODEV; |
@@ -1310,7 +1309,6 @@ static void ivtvfb_cleanup(void) | |||
1310 | 1309 | ||
1311 | drv = driver_find("ivtv", &pci_bus_type); | 1310 | drv = driver_find("ivtv", &pci_bus_type); |
1312 | err = driver_for_each_device(drv, NULL, NULL, ivtvfb_callback_cleanup); | 1311 | err = driver_for_each_device(drv, NULL, NULL, ivtvfb_callback_cleanup); |
1313 | put_driver(drv); | ||
1314 | } | 1312 | } |
1315 | 1313 | ||
1316 | module_init(ivtvfb_init); | 1314 | module_init(ivtvfb_init); |
diff --git a/drivers/media/video/ov6650.c b/drivers/media/video/ov6650.c index 6806345ec2f0..3627f3225bbb 100644 --- a/drivers/media/video/ov6650.c +++ b/drivers/media/video/ov6650.c | |||
@@ -649,7 +649,7 @@ static int ov6650_s_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) | |||
649 | clkrc = CLKRC_24MHz; | 649 | clkrc = CLKRC_24MHz; |
650 | } else { | 650 | } else { |
651 | dev_err(&client->dev, | 651 | dev_err(&client->dev, |
652 | "unspported input clock, check platform data\n"); | 652 | "unsupported input clock, check platform data\n"); |
653 | return -EINVAL; | 653 | return -EINVAL; |
654 | } | 654 | } |
655 | mclk = sense->master_clock; | 655 | mclk = sense->master_clock; |
diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/video/s5p-fimc/fimc-mdevice.c index 8ea4ee116e46..63eccb55728f 100644 --- a/drivers/media/video/s5p-fimc/fimc-mdevice.c +++ b/drivers/media/video/s5p-fimc/fimc-mdevice.c | |||
@@ -344,16 +344,13 @@ static int fimc_md_register_platform_entities(struct fimc_md *fmd) | |||
344 | return -ENODEV; | 344 | return -ENODEV; |
345 | ret = driver_for_each_device(driver, NULL, fmd, | 345 | ret = driver_for_each_device(driver, NULL, fmd, |
346 | fimc_register_callback); | 346 | fimc_register_callback); |
347 | put_driver(driver); | ||
348 | if (ret) | 347 | if (ret) |
349 | return ret; | 348 | return ret; |
350 | 349 | ||
351 | driver = driver_find(CSIS_DRIVER_NAME, &platform_bus_type); | 350 | driver = driver_find(CSIS_DRIVER_NAME, &platform_bus_type); |
352 | if (driver) { | 351 | if (driver) |
353 | ret = driver_for_each_device(driver, NULL, fmd, | 352 | ret = driver_for_each_device(driver, NULL, fmd, |
354 | csis_register_callback); | 353 | csis_register_callback); |
355 | put_driver(driver); | ||
356 | } | ||
357 | return ret; | 354 | return ret; |
358 | } | 355 | } |
359 | 356 | ||
diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 7884baeff76a..f7ca5cc143c6 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c | |||
@@ -58,7 +58,6 @@ static struct v4l2_subdev *find_and_register_subdev( | |||
58 | } | 58 | } |
59 | 59 | ||
60 | done: | 60 | done: |
61 | put_driver(drv); | ||
62 | return sd; | 61 | return sd; |
63 | } | 62 | } |
64 | 63 | ||