diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-10-26 02:07:45 -0200 |
| commit | 0112b169f6a802bc14c7d9c52eed37f5990dfa93 (patch) | |
| tree | 3d9a28f99541f1f5d7a1fef224daf340e8e92c45 /linux/drivers/media/video/cafe_ccic.c | |
| parent | 6d67fdc302e1b986dcbd6729167116a4463f1f03 (diff) | |
| parent | c8f0e62f66c8fae8399d077e41c8cbab137b3d4f (diff) | |
| download | mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.gz mediapointer-dvb-s2-0112b169f6a802bc14c7d9c52eed37f5990dfa93.tar.bz2 | |
merge: http://linuxtv.org/hg/~tmerle/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'linux/drivers/media/video/cafe_ccic.c')
| -rw-r--r-- | linux/drivers/media/video/cafe_ccic.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/linux/drivers/media/video/cafe_ccic.c b/linux/drivers/media/video/cafe_ccic.c index aed6ab229..9c9a33be6 100644 --- a/linux/drivers/media/video/cafe_ccic.c +++ b/linux/drivers/media/video/cafe_ccic.c @@ -3,6 +3,9 @@ * multifunction chip. Currently works with the Omnivision OV7670 * sensor. * + * The data sheet for this device can be found at: + * http://www.marvell.com/products/pcconn/88ALP01.jsp + * * Copyright 2006 One Laptop Per Child Association, Inc. * Copyright 2006-7 Jonathan Corbet <corbet@lwn.net> * @@ -2239,13 +2242,16 @@ static int cafe_pci_suspend(struct pci_dev *pdev, pm_message_t state) { struct cafe_camera *cam = cafe_find_by_pdev(pdev); int ret; + enum cafe_state cstate; ret = pci_save_state(pdev); if (ret) return ret; + cstate = cam->state; /* HACK - stop_dma sets to idle */ cafe_ctlr_stop_dma(cam); cafe_ctlr_power_down(cam); pci_disable_device(pdev); + cam->state = cstate; return 0; } |