From patchwork Tue May 14 16:07:01 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Jean-Philippe_Fran=C3=83=C2=A7ois?= X-Patchwork-Id: 2567331 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 2919E3FC5A for ; Tue, 14 May 2013 16:07:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932436Ab3ENQHj (ORCPT ); Tue, 14 May 2013 12:07:39 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:58349 "EHLO mail-wg0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932182Ab3ENQHi (ORCPT ); Tue, 14 May 2013 12:07:38 -0400 Received: by mail-wg0-f42.google.com with SMTP id j13so4175501wgh.5 for ; Tue, 14 May 2013 09:07:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:sender:from:to:cc:subject:date:message-id:x-mailer; bh=i/eb7a6Xok+qFTo2ZGjXMhDDn0okVldcJelvsOaFHdE=; b=n4zUt3AvLvh4+WlXUlIFsB/mDJz9zRmeFbQiPRgXXhhG0sZ/1JCxloGn2oKl1+SD/w ZLY8DfOaKaEaRljIYkkZtOcxuf3oBzNbE6PbCMFtG4lrCJ8lTgjiEDoDKl47tcJa1VIy ftmFVb7Xt/1WBUOWZ2FR0+P5mSFEcL0tC+3GyXlF4x61J/n2NbxB7KOBVknYbuhAbWNR KUQl74vCoLJO0f4a5tx5fXqv1NbsMM4bnSd5s9Vytjumb5/xemwKDdNiHDi+qi96Qb3X AkWrncai/w3bL1hI+JkXAoKqZsEGPl9Ut3T9ihcsvGSiVUnyyp364MzyytQjrMUBVOt/ Vvrw== X-Received: by 10.180.37.109 with SMTP id x13mr7767527wij.20.1368547657074; Tue, 14 May 2013 09:07:37 -0700 (PDT) Received: from localhost.localdomain (vil35-1-82-67-117-55.fbx.proxad.net. [82.67.117.55]) by mx.google.com with ESMTPSA id dq8sm24799434wib.1.2013.05.14.09.07.35 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 14 May 2013 09:07:36 -0700 (PDT) From: jp.francois@cynove.com To: khilman@linaro.org Cc: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org, paul@pwsan.com, stable@vger.kernel.org, =?UTF-8?q?Jean-Philippe=20Fran=C3=A7ois?= Subject: [PATCH] ARM : omap : remove __init for _enable_preprogram Date: Tue, 14 May 2013 18:07:01 +0200 Message-Id: <1368547621-8570-1-git-send-email-jp.francois@cynove.com> X-Mailer: git-send-email 1.7.0.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org _enable_preprogram is marked as __init, but is called from _enable which is not. This results in oops once init is freed. Fix this by removing the __init marker. Signed-off-by: Jean-Philippe François Acked-by: Kevin Hilman --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: b/arch/arm/mach-omap2/omap_hwmod.c =================================================================== --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2066,7 +2066,7 @@ * do so is present in the hwmod data, then call it and pass along the * return value; otherwise, return 0. */ -static int __init _enable_preprogram(struct omap_hwmod *oh) +static int _enable_preprogram(struct omap_hwmod *oh) { if (!oh->class->enable_preprogram) return 0;