diff options
| author | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-28 22:23:06 -0500 |
| commit | 47871889c601d8199c51a4086f77eebd77c29b0b (patch) | |
| tree | 40cdcac3bff0ee40cc33dcca61d0577cdf965f77 /drivers/media/video/vivi.c | |
| parent | c16cc0b464b8876cfd57ce1c1dbcb6f9a6a0bce3 (diff) | |
| parent | 30ff056c42c665b9ea535d8515890857ae382540 (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/firmware/iscsi_ibft.c
Diffstat (limited to 'drivers/media/video/vivi.c')
| -rw-r--r-- | drivers/media/video/vivi.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/vivi.c b/drivers/media/video/vivi.c index 37632a064966..cdbe70385c12 100644 --- a/drivers/media/video/vivi.c +++ b/drivers/media/video/vivi.c | |||
| @@ -1371,7 +1371,7 @@ static int __init vivi_create_instance(int inst) | |||
| 1371 | /* Now that everything is fine, let's add it to device list */ | 1371 | /* Now that everything is fine, let's add it to device list */ |
| 1372 | list_add_tail(&dev->vivi_devlist, &vivi_devlist); | 1372 | list_add_tail(&dev->vivi_devlist, &vivi_devlist); |
| 1373 | 1373 | ||
| 1374 | if (video_nr >= 0) | 1374 | if (video_nr != -1) |
| 1375 | video_nr++; | 1375 | video_nr++; |
| 1376 | 1376 | ||
| 1377 | dev->vfd = vfd; | 1377 | dev->vfd = vfd; |