Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1946070AbbFSVQD (ORCPT ); Fri, 19 Jun 2015 17:16:03 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:51613 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756110AbbFSUjP (ORCPT ); Fri, 19 Jun 2015 16:39:15 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Vasily Khoruzhick , Krzysztof Kozlowski , Wolfram Sang Subject: [PATCH 4.0 051/105] i2c: s3c2410: fix oops in suspend callback for non-dt platforms Date: Fri, 19 Jun 2015 13:35:41 -0700 Message-Id: <20150619203559.702587223@linuxfoundation.org> X-Mailer: git-send-email 2.4.4 In-Reply-To: <20150619203558.187802739@linuxfoundation.org> References: <20150619203558.187802739@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1127 Lines: 36 4.0-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vasily Khoruzhick commit 8d487a43c36b54a029d74ad3b0a6a9d1253e728a upstream. Initialize sysreg by default, otherwise driver will crash in suspend callback when not using DT. Signed-off-by: Vasily Khoruzhick Reviewed-by: Krzysztof Kozlowski Signed-off-by: Wolfram Sang Fixes: a7750c3ef01223 ("i2c: s3c2410: Handle i2c sys_cfg register in i2c driver") Signed-off-by: Greg Kroah-Hartman --- drivers/i2c/busses/i2c-s3c2410.c | 1 + 1 file changed, 1 insertion(+) --- a/drivers/i2c/busses/i2c-s3c2410.c +++ b/drivers/i2c/busses/i2c-s3c2410.c @@ -1143,6 +1143,7 @@ static int s3c24xx_i2c_probe(struct plat return -ENOMEM; i2c->quirks = s3c24xx_get_device_quirks(pdev); + i2c->sysreg = ERR_PTR(-ENOENT); if (pdata) memcpy(i2c->pdata, pdata, sizeof(*pdata)); else -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in Please read the FAQ at http://www.tux.org/lkml/