From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 89E1AC2BB1D for ; Fri, 10 Apr 2020 03:46:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 57CCF20A8B for ; Fri, 10 Apr 2020 03:46:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490406; bh=fpNrlUUTJSSi/PQgLIPLo6vQitr48svphV9IQte/vuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FStBfTEE3qDJuJG0vhLlhThXgj9jgfxzAN67Y7q5mRoDWdA0W6rY90hZ4ELAWFNwt G7hEFidAW1B78X3Pf7TkLrH++OuG/d7ZmOhuIItCnE79HUzX9Kysb++9rhTJ2qZjvV BU7MF9F+2zbjiSaq31gkDB8xpH/1Khj8jxcSF8zI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726082AbgDJDqo (ORCPT ); Thu, 9 Apr 2020 23:46:44 -0400 Received: from mail.kernel.org ([198.145.29.99]:56776 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726759AbgDJDqo (ORCPT ); Thu, 9 Apr 2020 23:46:44 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 4C1E721473; Fri, 10 Apr 2020 03:46:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586490404; bh=fpNrlUUTJSSi/PQgLIPLo6vQitr48svphV9IQte/vuY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k1yYXVGZ30yvktbIV0HYRPY0jycocQPrHhNeVxt5Px1c0dwY34ZYUAw93D93XRYqJ IQwvMqQTe3zCTTTmllAPl0+s97T0zr6lmsh34W6eSTnSnHQxQevBXwYWPKw2dkqf8Q BqKWhvO8NNtuKblyHlWVdRx2HR/QDk/FxAMYr/24= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Helen Koike , Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org, devel@driverdev.osuosl.org Subject: [PATCH AUTOSEL 5.6 07/68] media: staging: rkisp1: use consistent bus_info string for media_dev Date: Thu, 9 Apr 2020 23:45:32 -0400 Message-Id: <20200410034634.7731-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200410034634.7731-1-sashal@kernel.org> References: <20200410034634.7731-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Helen Koike [ Upstream commit 12d3d8090bc5e8cdda2f56caed2a2a0d70009456 ] Media device is using a slightly different bus_info string "platform: rkisp1" (with a space) instead of "platform:rkisp1" used by the rest of rkisp1 code. This causes errors when using v4l2-util tools that uses the bus_info string to identify the device. Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver") Signed-off-by: Helen Koike Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/staging/media/rkisp1/rkisp1-dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c index 558126e66465c..9b47f41b36e94 100644 --- a/drivers/staging/media/rkisp1/rkisp1-dev.c +++ b/drivers/staging/media/rkisp1/rkisp1-dev.c @@ -502,8 +502,7 @@ static int rkisp1_probe(struct platform_device *pdev) strscpy(rkisp1->media_dev.model, RKISP1_DRIVER_NAME, sizeof(rkisp1->media_dev.model)); rkisp1->media_dev.dev = &pdev->dev; - strscpy(rkisp1->media_dev.bus_info, - "platform: " RKISP1_DRIVER_NAME, + strscpy(rkisp1->media_dev.bus_info, RKISP1_BUS_INFO, sizeof(rkisp1->media_dev.bus_info)); media_device_init(&rkisp1->media_dev); -- 2.20.1