From 35e863f12a84430b93f45e9c661afcf98b7f5d65 Mon Sep 17 00:00:00 2001 From: Jonathan Corbet Date: Tue, 23 Oct 2007 17:30:27 -0300 Subject: [PATCH] --- yaml --- r: 73144 b: refs/heads/master c: c303449741279fc9a108c80e0816f0c4ddca8c09 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/media/video/cafe_ccic.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f7bf704aa38d..43f2d558b6a3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8ab68bffe3fe7b8e9ff963ea321d283fc77ac5f +refs/heads/master: c303449741279fc9a108c80e0816f0c4ddca8c09 diff --git a/trunk/drivers/media/video/cafe_ccic.c b/trunk/drivers/media/video/cafe_ccic.c index b63cab336920..2567da7b09eb 100644 --- a/trunk/drivers/media/video/cafe_ccic.c +++ b/trunk/drivers/media/video/cafe_ccic.c @@ -2232,13 +2232,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; }