From patchwork Thu Oct 10 06:04:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jean Delvare X-Patchwork-Id: 282121 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id ED9DF2C011C for ; Thu, 10 Oct 2013 17:04:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754488Ab3JJGEO (ORCPT ); Thu, 10 Oct 2013 02:04:14 -0400 Received: from cantor2.suse.de ([195.135.220.15]:49518 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751215Ab3JJGEO (ORCPT ); Thu, 10 Oct 2013 02:04:14 -0400 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 94182A50DE; Thu, 10 Oct 2013 08:04:12 +0200 (CEST) Date: Thu, 10 Oct 2013 08:04:06 +0200 From: Jean Delvare To: Linux I2C Cc: Wolfram Sang , Mika Westerberg , "Rafael J. Wysocki" Subject: [PATCH] i2c: Not all adapters have a parent Message-ID: <20131010080406.3e0fd78e@endymion.delvare> Organization: Suse Linux X-Mailer: Claws Mail 3.9.2 (GTK+ 2.24.18; x86_64-suse-linux-gnu) Mime-Version: 1.0 Sender: linux-i2c-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-i2c@vger.kernel.org The code in acpi_i2c_register_devices() assumes that all i2c adapters have a parent. This is not necessarily the case, for example the i2c-stub driver instantiate a virtual i2c adapter without a parent. Check for this to avoid a NULL pointer deference. Signed-off-by: Jean Delvare Cc: Wolfram Sang Cc: Mika Westerberg Cc: "Rafael J. Wysocki" Acked-by: Mika Westerberg --- drivers/i2c/i2c-core.c | 3 +++ 1 file changed, 3 insertions(+) --- linux-3.12-rc4.orig/drivers/i2c/i2c-core.c 2013-09-24 00:41:09.000000000 +0200 +++ linux-3.12-rc4/drivers/i2c/i2c-core.c 2013-10-10 07:46:12.244886047 +0200 @@ -1134,6 +1134,9 @@ static void acpi_i2c_register_devices(st acpi_handle handle; acpi_status status; + if (!adap->dev.parent) + return; + handle = ACPI_HANDLE(adap->dev.parent); if (!handle) return;