projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
staging
/
media
/
davinci_vpfe
/
vpfe_mc_capture.c
diff --git
a/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
b/drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
index 57426199ad7af48203a349afe66eaa407db120bf..01df0683e950734ca66fbc1b3fb7289acfea1a58 100644
(file)
--- a/
drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
+++ b/
drivers/staging/media/davinci_vpfe/vpfe_mc_capture.c
@@
-294,7
+294,7
@@
static void vpfe_detach_irq(struct vpfe_device *vpfe_dev)
*/
static int vpfe_attach_irq(struct vpfe_device *vpfe_dev)
{
- int ret
= 0
;
+ int ret;
ret = request_irq(vpfe_dev->ccdc_irq0, vpfe_isr, 0,
"vpfe_capture0", vpfe_dev);