aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/s5p-fimc
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2012-03-27 10:32:29 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-03-27 10:32:29 -0400
commit50953e0640b3473dcb409d5d0d938c2742c93b0d (patch)
tree3b0dc374e61564fbbd8adff92c8fae16fdeb423a /drivers/media/video/s5p-fimc
parentf92c97c8bd77992ff8bd6ef29a23dc82dca799cb (diff)
parent626cf236608505d376e4799adb4f7eb00a8594af (diff)
Merge branch 'poll' into staging/for_v3.4
* poll: (5970 commits) poll: add poll_requested_events() and poll_does_not_wait() functions crc32: select an algorithm via Kconfig crc32: add self-test code for crc32c crypto: crc32c should use library implementation crc32: bolt on crc32c crc32: add note about this patchset to crc32.c crc32: optimize loop counter for x86 crc32: add slice-by-8 algorithm to existing code crc32: make CRC_*_BITS definition correspond to actual bit counts crc32: fix mixing of endian-specific types crc32: miscellaneous cleanups crc32: simplify unit test code crc32: move long comment about crc32 fundamentals to Documentation/ crc32: remove two instances of trailing whitespaces checkpatch: check for quoted strings broken across lines checkpatch: whitespace - add/remove blank lines checkpatch: warn on use of yield() checkpatch: add --strict tests for braces, comments and casts checkpatch: add [] to type extensions checkpatch: high precedence operators do not require additional parentheses in #defines ...
Diffstat (limited to 'drivers/media/video/s5p-fimc')
-rw-r--r--drivers/media/video/s5p-fimc/fimc-mdevice.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/media/video/s5p-fimc/fimc-mdevice.c b/drivers/media/video/s5p-fimc/fimc-mdevice.c
index 087ea098ea29..62ed37e40149 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