projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'work.namei' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
[linux-2.6-microblaze.git]
/
drivers
/
staging
/
media
/
atomisp
/
pci
/
atomisp2
/
atomisp_v4l2.c
diff --git
a/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
b/drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
index
548e00e
..
ba20344
100644
(file)
--- a/
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
+++ b/
drivers/staging/media/atomisp/pci/atomisp2/atomisp_v4l2.c
@@
-1137,7
+1137,6
@@
static int init_atomisp_wdts(struct atomisp_device *isp)
for (i = 0; i < isp->num_of_streams; i++) {
struct atomisp_sub_device *asd = &isp->asd[i];
- asd = &isp->asd[i];
#ifndef ISP2401
timer_setup(&asd->wdt, atomisp_wdt, 0);
#else