From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753970Ab1I1KoQ (ORCPT ); Wed, 28 Sep 2011 06:44:16 -0400 Received: from opensource.wolfsonmicro.com ([80.75.67.52]:50446 "EHLO opensource.wolfsonmicro.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753254Ab1I1Kn7 (ORCPT ); Wed, 28 Sep 2011 06:43:59 -0400 From: Dimitris Papastamos To: Mark Brown Cc: linux-kernel@vger.kernel.org, Lars-Peter Clausen Subject: [PATCH 7/7] regmap: Ensure we scream if we enable cache bypass/only at the same time Date: Wed, 28 Sep 2011 11:43:47 +0100 Message-Id: <1317206627-6673-7-git-send-email-dp@opensource.wolfsonmicro.com> X-Mailer: git-send-email 1.7.6.4 In-Reply-To: <1317206627-6673-1-git-send-email-dp@opensource.wolfsonmicro.com> References: <1317206627-6673-1-git-send-email-dp@opensource.wolfsonmicro.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Signed-off-by: Dimitris Papastamos --- drivers/base/regmap/regcache.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/base/regmap/regcache.c b/drivers/base/regmap/regcache.c index a3f466c..3d59f14 100644 --- a/drivers/base/regmap/regcache.c +++ b/drivers/base/regmap/regcache.c @@ -282,6 +282,8 @@ EXPORT_SYMBOL_GPL(regcache_sync); */ void regcache_cache_only(struct regmap *map, bool enable) { + BUG_ON(map->cache_bypass && enable); + mutex_lock(&map->sync_lock); map->cache_only = enable; mutex_unlock(&map->sync_lock); @@ -301,6 +303,8 @@ EXPORT_SYMBOL_GPL(regcache_cache_only); */ void regcache_cache_bypass(struct regmap *map, bool enable) { + BUG_ON(map->cache_only && enable); + mutex_lock(&map->sync_lock); map->cache_bypass = enable; mutex_unlock(&map->sync_lock); -- 1.7.6.4