Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 58b108b0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "QBT1000: avoid wait in suspend callback"

parents 94ab7593 8cdc99ce
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -1268,7 +1268,8 @@ static int qbt1000_suspend(struct platform_device *pdev, pm_message_t state)
	 * while making a TZ call. Hence the clock check to determine if the
	 * driver will allow suspend to occur.
	 */
	mutex_lock(&drvdata->mutex);
	if (!mutex_trylock(&drvdata->mutex))
		return -EBUSY;
	if (((drvdata->sensor_conn_type == SPI) && (drvdata->clock_state)) ||
	    ((drvdata->sensor_conn_type == SSC_SPI) && (drvdata->ssc_state)))
		rc = -EBUSY;