From patchwork Fri Dec 13 22:24:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 22440 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f200.google.com (mail-ob0-f200.google.com [209.85.214.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4338123FF5 for ; Fri, 13 Dec 2013 22:28:10 +0000 (UTC) Received: by mail-ob0-f200.google.com with SMTP id wm4sf8747081obc.7 for ; Fri, 13 Dec 2013 14:28:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=DqFXVD2rYO+3hv2hJdI4a93pGHdWgay2Ii7VqGUSdao=; b=d3K3s7P5NdcIH2GXKnf7FAqDjlX+0DY9q/svl9dhDFCKUTLB8gIJK00cEi0fNt75zi s2saQDyELr4qCldPKVQB7T4zXSnRX7rbBy5BU3gLDwOsgkCRxH/R50+vskCc985XOjKz lJqRsJGOi077Swf48jF3RutJjdtnuhimfv7dEQxK18nptWdF1k5JLY2DI/ceD4fjdsDE 8rY/PeJZnW58bYlEz2GcYsIaWcYIZyftNE/YK/2IXdrcpPhcVClyVRAcOzKLA+Mrj7Vb 69pBGzf7NFa74N4Fw2MIWerEiKBT28ZasWQXPp2BaMRuMzCBtZF3EGWHWNI4jR2+DXup M5pQ== X-Gm-Message-State: ALoCoQlFPBfoVYQb5czciAWYxJooPzIo98rB5dwTT7Nu4NLzHq/TIZ5JoDQyb3b9BsKV1QkVMHSj X-Received: by 10.182.16.199 with SMTP id i7mr1705313obd.42.1386973689898; Fri, 13 Dec 2013 14:28:09 -0800 (PST) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.36.136 with SMTP id q8ls1150925qej.36.gmail; Fri, 13 Dec 2013 14:28:09 -0800 (PST) X-Received: by 10.221.37.9 with SMTP id tc9mr2195676vcb.39.1386973689818; Fri, 13 Dec 2013 14:28:09 -0800 (PST) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id xn8si1194170vdc.74.2013.12.13.14.28.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:28:09 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id lf12so1743658vcb.35 for ; Fri, 13 Dec 2013 14:28:09 -0800 (PST) X-Received: by 10.220.189.2 with SMTP id dc2mr491982vcb.60.1386973689739; Fri, 13 Dec 2013 14:28:09 -0800 (PST) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp73603vcz; Fri, 13 Dec 2013 14:28:09 -0800 (PST) X-Received: by 10.66.150.41 with SMTP id uf9mr6099626pab.108.1386973688941; Fri, 13 Dec 2013 14:28:08 -0800 (PST) Received: from mail-pa0-f44.google.com (mail-pa0-f44.google.com [209.85.220.44]) by mx.google.com with ESMTPS id tt8si2490924pbc.288.2013.12.13.14.28.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:28:08 -0800 (PST) Received-SPF: neutral (google.com: 209.85.220.44 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.44; Received: by mail-pa0-f44.google.com with SMTP id fa1so597527pad.3 for ; Fri, 13 Dec 2013 14:28:08 -0800 (PST) X-Received: by 10.66.147.9 with SMTP id tg9mr5992983pab.5.1386973688470; Fri, 13 Dec 2013 14:28:08 -0800 (PST) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id qz9sm7457908pbc.3.2013.12.13.14.28.07 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 13 Dec 2013 14:28:07 -0800 (PST) From: John Stultz To: LKML Cc: Greg KH , Android Kernel Team , Sumit Semwal , Jesse Barker , Colin Cross , John Stultz Subject: [PATCH 078/115] ion: don't use id 0 for handle cookie Date: Fri, 13 Dec 2013 14:24:52 -0800 Message-Id: <1386973529-4884-79-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> References: <1386973529-4884-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.220.176 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Colin Cross ion userspace clients think that the cookie is a pointer, so they use NULL to check if the handle has been initialized. Set the first id number to 1. Signed-off-by: Colin Cross [jstultz: modified patch to apply to staging directory] Signed-off-by: John Stultz --- drivers/staging/android/ion/ion.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/staging/android/ion/ion.c b/drivers/staging/android/ion/ion.c index ef0b2d7..273ec3a 100644 --- a/drivers/staging/android/ion/ion.c +++ b/drivers/staging/android/ion/ion.c @@ -424,7 +424,7 @@ static int ion_handle_add(struct ion_client *client, struct ion_handle *handle) rc = idr_pre_get(&client->idr, GFP_KERNEL); if (!rc) return -ENOMEM; - rc = idr_get_new(&client->idr, handle, &id); + rc = idr_get_new_above(&client->idr, handle, 1, &id); handle->id = id; } while (rc == -EAGAIN);