From nobody Thu Dec 25 17:55:49 2025 Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) (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 B1B7342A85 for ; Fri, 12 Jan 2024 14:31:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="YzKXqoh0" Received: by mail-wr1-f49.google.com with SMTP id ffacd0b85a97d-3368abe1093so4985227f8f.2 for ; Fri, 12 Jan 2024 06:31:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705069873; x=1705674673; darn=vger.kernel.org; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :from:to:cc:subject:date:message-id:reply-to; bh=aw07nAMv5oGDdJtDs7MOtSYaErH1ufSaIcr/61fVq1Y=; b=YzKXqoh06uLU1EhdpA2dr7mGNxUR+54SGsl54pWC4Sq5XMlGSk+pXhc/rHuJGkQowr p+23lsKidUU5LavhbfEBEoL+DiG7EAPjcGDyHvssBIrfCeKuxZBHOY1McGMhjomWctfv kZSL9TSkXBuHldkT8UTL7JzrkKHcw7MAbZtkVz/7W3QeAnHF8cAI3I2EYsURko4BrJDv BOXUf91B3aRwD8myeawLnPz4w2avki/mQMFHNncRxvUvMuG0pdWWiaJNnfTO3k0Txi8A BfBfHRgWFXvgz8z8gwALtXTIvLYNylaOXdl+65pputRuDq5u/QQJjI/grBbQBKpbocpa lVrQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705069873; x=1705674673; h=content-disposition:mime-version:message-id:subject:cc:to:from:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=aw07nAMv5oGDdJtDs7MOtSYaErH1ufSaIcr/61fVq1Y=; b=D1UHfREAMt4HD18reWTtVRCo6BP8rwNnyNMc3B3ryynxTjtLDBtwK28yqCm4xc1GFL xpvTdM0Fxc1d06t8fQrflDzQzjMidL/6ponOazj9prtkZVv53wDxxv39kFNkgH8Nb9YI AAWDepVycPMAHOtj7wE4s0UT0bnGsuQ7dEFxoXdtPu6xrPQJZc/qZmgJO3GjSgAC8oLX wBEAxEFUvWCLyavStoALrVk7yEqPCfoq7xRuG3SdRQD+Ky3hZULQP4Vjq+voTzf9ELqN dhHdyt9pa46aawZ6elwi+jYeAtTKtfw4UuY4T6b1u+44tR3fORB0F9zxf0/Vpi7MR6MG mJ1w== X-Gm-Message-State: AOJu0YyirKg+4bTKK0hDpT8Wh85ASrdkMLAex6P9y/TfApIQu/KpRyHs Js9xG4xh58XdO/31QCByo49Attmj8mdE4Q== X-Google-Smtp-Source: AGHT+IFXMCPqgdEgsPkqLjC6vO/Vvti/WhxuK2GBHGBXb1gKi2FF2DFsgVScc5hicSE+pHcaXwfSew== X-Received: by 2002:a5d:590f:0:b0:337:7680:8ccf with SMTP id v15-20020a5d590f000000b0033776808ccfmr817239wrd.56.1705069873001; Fri, 12 Jan 2024 06:31:13 -0800 (PST) Received: from localhost ([102.140.209.237]) by smtp.gmail.com with ESMTPSA id x9-20020adfec09000000b00336b8461a5esm4028872wrn.88.2024.01.12.06.31.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jan 2024 06:31:12 -0800 (PST) Date: Fri, 12 Jan 2024 17:31:09 +0300 From: Dan Carpenter To: Dave Airlie Cc: Karol Herbst , Lyude Paul , Danilo Krummrich , Daniel Vetter , Dave Airlie , dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: [PATCH] drm/nouveau/disp/r535: fix error code in r535_dp_aux_xfer() Message-ID: <5e2be90e-c7b8-4366-ab93-69040734742e@moroto.mountain> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline X-Mailer: git-send-email haha only kidding Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This code was shuffled around but the return wasn't updated. It should return "ret" instead of "ctrl". Fixes: 4ae3a20102b2 ("nouveau/gsp: don't free ctrl messages on errors") Signed-off-by: Dan Carpenter --- drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c b/drivers/gpu/= drm/nouveau/nvkm/engine/disp/r535.c index 6a0a4d3b8902..027867c2a8c5 100644 --- a/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c +++ b/drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c @@ -1080,7 +1080,7 @@ r535_dp_aux_xfer(struct nvkm_outp *outp, u8 type, u32= addr, u8 *data, u8 *psize) ret =3D nvkm_gsp_rm_ctrl_push(&disp->rm.objcom, &ctrl, sizeof(*ctrl)); if (ret) { nvkm_gsp_rm_ctrl_done(&disp->rm.objcom, ctrl); - return PTR_ERR(ctrl); + return ret; } =20 memcpy(data, ctrl->data, size); --=20 2.43.0