From ce06da4d96c41d461c7f9421eadb6d7e82d533ac Mon Sep 17 00:00:00 2001 From: Mark Brown Date: Tue, 5 Feb 2013 14:14:32 +0000 Subject: [PATCH] --- yaml --- r: 350364 b: refs/heads/master c: 95601d65a1aa0902f838a2919e11ee6311efe371 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/regmap/regmap-spi.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index d85febb897a5..f33493095fd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f88948eff9a6160ed74e3ee4b12f41f5beeff115 +refs/heads/master: 95601d65a1aa0902f838a2919e11ee6311efe371 diff --git a/trunk/drivers/base/regmap/regmap-spi.c b/trunk/drivers/base/regmap/regmap-spi.c index 913274b5f00a..4c506bd940f3 100644 --- a/trunk/drivers/base/regmap/regmap-spi.c +++ b/trunk/drivers/base/regmap/regmap-spi.c @@ -86,6 +86,8 @@ static struct regmap_async *regmap_spi_async_alloc(void) struct regmap_async_spi *async_spi; async_spi = kzalloc(sizeof(*async_spi), GFP_KERNEL); + if (!async_spi) + return NULL; return &async_spi->core; }