From owner-svn-src-head@freebsd.org  Mon Aug  3 01:22:50 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 998739AFA64;
 Mon,  3 Aug 2015 01:22:50 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8A44F1C7D;
 Mon,  3 Aug 2015 01:22:50 +0000 (UTC)
 (envelope-from gonzo@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t731Moqi056318;
 Mon, 3 Aug 2015 01:22:50 GMT (envelope-from gonzo@FreeBSD.org)
Received: (from gonzo@localhost)
 by repo.freebsd.org (8.14.9/8.14.9/Submit) id t731MoXh056317;
 Mon, 3 Aug 2015 01:22:50 GMT (envelope-from gonzo@FreeBSD.org)
Message-Id: <201508030122.t731MoXh056317@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: gonzo set sender to
 gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
Date: Mon, 3 Aug 2015 01:22:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r286214 - head/sys/arm/ti
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Aug 2015 01:22:50 -0000

Author: gonzo
Date: Mon Aug  3 01:22:49 2015
New Revision: 286214
URL: https://svnweb.freebsd.org/changeset/base/286214

Log:
  Pass correct type of argument to ti_gpio_unmask_irq in ti_gpio_activate_resource

Modified:
  head/sys/arm/ti/ti_gpio.c

Modified: head/sys/arm/ti/ti_gpio.c
==============================================================================
--- head/sys/arm/ti/ti_gpio.c	Sun Aug  2 21:33:40 2015	(r286213)
+++ head/sys/arm/ti/ti_gpio.c	Mon Aug  3 01:22:49 2015	(r286214)
@@ -849,14 +849,16 @@ static int
 ti_gpio_activate_resource(device_t dev, device_t child, int type, int rid,
 	struct resource *res)
 {
-	int pin;
+	struct ti_gpio_mask_arg mask_arg;
 
 	if (type != SYS_RES_IRQ)
 		return (ENXIO);
 
 	/* Unmask the interrupt. */
-	pin = rman_get_start(res);
-	ti_gpio_unmask_irq((void *)(uintptr_t)pin);
+	mask_arg.pin = rman_get_start(res);
+	mask_arg.softc = device_get_softc(dev);
+
+	ti_gpio_unmask_irq((void *)&mask_arg);
 
 	return (0);
 }