From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD9EE3C3C0B for ; Wed, 8 Jul 2026 06:30:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783492263; cv=none; b=o6VqGMCfX5vCCgc4rxSJNapUC4bfQeZOuFbrj0ESRoa6Dv4Fq836oHAoy2tsOotsKCisx68lp4LMcLTx27cMJDCexIC5OrZ45fKnVVTvADEnxIKoKPsnblByVhoqOhSOkePPpAg7eOHr9YS7BbnMbALbqqnpvbAzHcClQaaHRMQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783492263; c=relaxed/simple; bh=jbsFDlRQuSmInuQqNI9thm7ygsBg8pj4i0VYnh6OBYY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=kdxjVltamhdmxBpjuWhCQ1+DL145uDHTrO7UBy2mzi0S1SSSvvx4m10vv40c8vmx6EYdCw1FN2S3mnK8YoyowRAlNEt9uWVmOkB+hdQg6/OklxVE1KE+UAhOvxpLtdfY7piaB/oLHtFqEt+RsAzP0xFafmmMStc+UWWEpuEb9xo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jqVPhGxU; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jqVPhGxU" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2cc7e86e7aeso3778535ad.2 for ; Tue, 07 Jul 2026 23:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783492257; x=1784097057; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to:content-type; bh=RiX4q8N7YLB6NwXUpVKP11/NIKOsQ8F+JImq6gEWdOs=; b=jqVPhGxUZNqxSIS6ZpInn6qRr/jBySY8DzwgmeIrn0Dj+u7TmxbuDMPvk+2b7/d3NE 6e4vKqf5dzg916tEOzM8K2bGJIpbCLcT/0y7/ezYky6B4xK2AhO0bzeRle28ImEq3N+S heLNwFVR3VNj1kZ5m35BbEYTCIuJMs/SupH3eX3zdx4PZ0QemwbqYXyCvuF8RpAbYrUd ZNWp8WFdZGDOZ1x996xC8ZiO8Gkwy4fWzRvArW95VwMAppnuUt2igjpISyUAANmNRrbF LABVW5Z5bh5ulusHsC21yU1JSlxt7P3EexGthL/9gvaIkhWwd5f7/zkG5vRsX1w6JgQC jwXA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783492257; x=1784097057; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-gg:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RiX4q8N7YLB6NwXUpVKP11/NIKOsQ8F+JImq6gEWdOs=; b=PQxOyQ5TI94xu2YMD4Kq4tvNOHaBs2b6V1yqvWOkpuzjJSpF2rvr/MCtwedT33I/Cl yA54OHIKz5bX+no1qmHKnd8a+sLCDdDL2II/DGx6W9pYgXTdvcqbRp4NFDGLendwuTJH Sugza2obhOr6qL7wru9uUebylnrEaP7/mJ9yg5qTWpMS/1ZLypMGIXkRT/xEJNTE3e0D Oh7RKbosx94E3XfBv1CqunkgvwGk0RgSvhh4jGwLfsIIw23UjxD1KVWgkKwX/CcNeBrX kFwlGQmz4Gn5DB1h2qmNc+TjQOTAAJVOucjyoopYL+QQuLlv8aGpMc5WlO+f9eYLnv+g WT2A== X-Forwarded-Encrypted: i=1; AHgh+Rrw/kqu8l386mA8AAmol9v0G1RaLELQSgpx5eYpFqGCRzHlq1cZKycJt17IBL6/yM1/csue2HamKiGrBM8=@vger.kernel.org X-Gm-Message-State: AOJu0YzaQkDbSE6wTlru5tZPBmnK90ddFShL9kFVBd1KTXOMVyp+wSWh yKUCNwsOG2R+PR0CqpfriWH4Qji9XQb6tJZ2wcSdGqVaCvZgZPTZpviaXbhLTBMR9NM= X-Gm-Gg: AfdE7ckTqm9wxFsX3KtmaOB6XDB02vQgoYuKdM/ivOndtmVDr61rKPWWUE7QVGh4Stt JDChgywlbaM0OvwHJXGqf0KwTN6CJ6yfKiW99jldwT6XorcANQTgRj3ev4GbA4ZCS4Bwyylnhnp T5SJeVHLqruz066h+JXRRD2GzWgP1igp8H1I2NENpn6rICaxI8Ze5RF9p99Z4OOqBGyCJ/WOES8 Qyr65ODVJN74rmNpfloMLzkxn2VlmNCUXcZ9TosnHsby0jcmkABYUqY5X93qLgIbuez4Mw3CCVE jlp4PyAyRfwgv4l+4+QbRRZwzf7L+2nb8KAhyJqKDtZxRQW3VG4b6r9T/2roaomc703Ga5F66hB eDYIBMbtLJvG/qILKhnakzhkMQ1+SvjWsXeh2MBbMWpwcfkpb28Lztpcd8yo4FCU42oD2sWU= X-Received: by 2002:a17:902:d48f:b0:2c6:a981:b591 with SMTP id d9443c01a7336-2ccea40c7b2mr12597945ad.30.1783492257240; Tue, 07 Jul 2026 23:30:57 -0700 (PDT) Received: from lgs.. ([2001:250:5800:1000::f280]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ccc9d3d474sm23037665ad.70.2026.07.07.23.30.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2026 23:30:56 -0700 (PDT) From: Guangshuo Li To: Tomeu Vizoso , Oded Gabbay , Jeff Hugo , Robert Foss , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Cc: Guangshuo Li Subject: [PATCH] accel/rocket: clear rdev on device init failure Date: Wed, 8 Jul 2026 14:28:45 +0800 Message-ID: <20260708062845.716487-1-lgs201920130244@gmail.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit rocket_probe() stores the return value from rocket_device_init() in the file-scoped rdev pointer before checking whether it is an error pointer. If rocket_device_init() fails, rdev is left as an ERR_PTR. The rdev pointer is also used as the marker for whether the shared rocket device has already been initialized. A later core probe can therefore see a non-NULL rdev, skip rocket_device_init(), and dereference the error pointer when reading rdev->num_cores. Save the error code and clear rdev before returning from the rocket_device_init() failure path. Fixes: ed98261b4168 ("accel/rocket: Add a new driver for Rockchip's NPU") Signed-off-by: Guangshuo Li --- drivers/accel/rocket/rocket_drv.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/accel/rocket/rocket_drv.c b/drivers/accel/rocket/rocket_drv.c index 8bbbce594883..67e7f543fe4c 100644 --- a/drivers/accel/rocket/rocket_drv.c +++ b/drivers/accel/rocket/rocket_drv.c @@ -165,8 +165,11 @@ static int rocket_probe(struct platform_device *pdev) /* First core probing, initialize DRM device. */ rdev = rocket_device_init(drm_dev, &rocket_drm_driver); if (IS_ERR(rdev)) { + int err = PTR_ERR(rdev); + dev_err(&pdev->dev, "failed to initialize rocket device\n"); - return PTR_ERR(rdev); + rdev = NULL; + return err; } } -- 2.43.0