From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965992AbbDVQPk (ORCPT ); Wed, 22 Apr 2015 12:15:40 -0400 Received: from mail-lb0-f177.google.com ([209.85.217.177]:33524 "EHLO mail-lb0-f177.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965716AbbDVQOa (ORCPT ); Wed, 22 Apr 2015 12:14:30 -0400 From: Ricardo Ribalda Delgado To: Greg Kroah-Hartman , Grant Likely , Rob Herring , Andrew Morton , Jakub Sitnicki , Vivek Goyal , Bjorn Helgaas , Jiang Liu , Mike Travis , Thierry Reding , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org Cc: Ricardo Ribalda Delgado Subject: [PATCH v3 4/4] of/platform: Use platform_device interface Date: Wed, 22 Apr 2015 18:14:21 +0200 Message-Id: <1429719261-18024-5-git-send-email-ricardo.ribalda@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com> References: <1429719261-18024-1-git-send-email-ricardo.ribalda@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org of_platform_device_create_pdata() was using of_device_add() to create the devices, but of_platform_device_destroy was using of_platform_device_destroy(). of_device_add(), do not call insert_resource(), which initializes the parent field of the resource structure, needed by release_resource(), called by of_platform_device_destroy(). This leads to a NULL pointer deference. This patch, replaces of_device_add() with platform_device_data(). Signed-off-by: Ricardo Ribalda Delgado --- drivers/of/platform.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/of/platform.c b/drivers/of/platform.c index a01f57c..f011f57 100644 --- a/drivers/of/platform.c +++ b/drivers/of/platform.c @@ -183,8 +183,9 @@ static struct platform_device *of_platform_device_create_pdata( dev->dev.bus = &platform_bus_type; dev->dev.platform_data = platform_data; of_dma_configure(&dev->dev, dev->dev.of_node); + dev->name = dev_name(&dev->dev); - if (of_device_add(dev) != 0) { + if (platform_device_add(dev) != 0) { of_dma_deconfigure(&dev->dev); platform_device_put(dev); goto err_clear_flag; -- 2.1.4