diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-12-19 06:22:11 -0500 |
| commit | 356f402da0f989b16e4b6849e88dba5df0e25944 (patch) | |
| tree | d1d41d07abf30bdd7fe1498f6eb239eaced6d9b3 /drivers/media/platform/omap3isp/isp.c | |
| parent | 3a6c5d8ad0a9253aafb76df3577edcb68c09b939 (diff) | |
| parent | 96b7fe0119b932ad25451d2b6357e727bbe6a309 (diff) | |
Merge tag 'asoc-v3.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v3.13
The fixes here are all driver specific ones, none of which particularly
stand out but all of which are useful to users of those drivers.
Diffstat (limited to 'drivers/media/platform/omap3isp/isp.c')
| -rw-r--r-- | drivers/media/platform/omap3isp/isp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/platform/omap3isp/isp.c b/drivers/media/platform/omap3isp/isp.c index 1c3608039663..561bce8ffb1b 100644 --- a/drivers/media/platform/omap3isp/isp.c +++ b/drivers/media/platform/omap3isp/isp.c | |||
| @@ -1673,7 +1673,7 @@ void omap3isp_print_status(struct isp_device *isp) | |||
| 1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in | 1673 | * ISP clocks get disabled in suspend(). Similarly, the clocks are reenabled in |
| 1674 | * resume(), and the the pipelines are restarted in complete(). | 1674 | * resume(), and the the pipelines are restarted in complete(). |
| 1675 | * | 1675 | * |
| 1676 | * TODO: PM dependencies between the ISP and sensors are not modeled explicitly | 1676 | * TODO: PM dependencies between the ISP and sensors are not modelled explicitly |
| 1677 | * yet. | 1677 | * yet. |
| 1678 | */ | 1678 | */ |
| 1679 | static int isp_pm_prepare(struct device *dev) | 1679 | static int isp_pm_prepare(struct device *dev) |