|
@@ -1023,7 +1023,7 @@ static int gsc_m2m_suspend(struct gsc_dev *gsc)
|
|
|
return timeout == 0 ? -EAGAIN : 0;
|
|
|
}
|
|
|
|
|
|
-static int gsc_m2m_resume(struct gsc_dev *gsc)
|
|
|
+static void gsc_m2m_resume(struct gsc_dev *gsc)
|
|
|
{
|
|
|
struct gsc_ctx *ctx;
|
|
|
unsigned long flags;
|
|
@@ -1036,8 +1036,6 @@ static int gsc_m2m_resume(struct gsc_dev *gsc)
|
|
|
|
|
|
if (test_and_clear_bit(ST_M2M_SUSPENDED, &gsc->state))
|
|
|
gsc_m2m_job_finish(ctx, VB2_BUF_STATE_ERROR);
|
|
|
-
|
|
|
- return 0;
|
|
|
}
|
|
|
|
|
|
static int gsc_probe(struct platform_device *pdev)
|
|
@@ -1159,8 +1157,9 @@ static int gsc_runtime_resume(struct device *dev)
|
|
|
|
|
|
gsc_hw_set_sw_reset(gsc);
|
|
|
gsc_wait_reset(gsc);
|
|
|
+ gsc_m2m_resume(gsc);
|
|
|
|
|
|
- return gsc_m2m_resume(gsc);
|
|
|
+ return 0;
|
|
|
}
|
|
|
|
|
|
static int gsc_runtime_suspend(struct device *dev)
|