Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2771073imj; Mon, 11 Feb 2019 08:13:09 -0800 (PST) X-Google-Smtp-Source: AHgI3IYy8SM8XY8v45xiu40KJbe3dVhVPfHXG3qOwaqZKUu8RFFe8MZ2E52Qa5Z3aOUTsrkksxYs X-Received: by 2002:a63:dc53:: with SMTP id f19mr25863457pgj.406.1549901589545; Mon, 11 Feb 2019 08:13:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549901589; cv=none; d=google.com; s=arc-20160816; b=YwEzYHagyg8x7EjSetmjKSdOyCa4g3IXnELwqj2sS/xjxjhQOy5vkl7+HQr3jIk8Da tMNPXgYnckAI8K8blmdgo63KcYqio2+oD07F0+aqpUFakeK4OpZMudc/zRg4uDvDGFdv EWFHbbKGN/5MIIoATpxJ2u7mw7JR5UWSIq/X1fvW5nYa8DmSEOKA9pX7I1jx509715AC QCjPeGaqLwA1oImvPtw2vVrm4sSYH7iT2owezyaeSqKvuViB8Q3eXZ0VBBDRVMXyLm+g BJ+D+NtF5U6y2B6LuOebOm+tnHKuPj0aPSz2KZlHN2MYbe0Ey0IL+Dns611IiLr1Oo/U 8dbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=6/yyA1d4DT1WF+hf3HhXkr2Ip9vpKQWFfF0TAddHThM=; b=qU+NGc/wzvTgIIDnBL8+hlhBHDdPlmw75j8EF03rte46epaYYyOIiz6em09Bs0NI21 XD6+fP7DHFH1Qznm73n91fzl9/YdE1hEIJNfyhApZ90E3144fnAya/RbBqhr2LV2eSjt iiR/me1OKBvrlMDO9C0XqNarySYEFGonkBLsSS1+Y0/Fp/NhoTuXxS6/XBhWGlrQ2VGo GtgrB9GJN8SgZkXhYO+K4YO/HgqmAVZVEnMTVBChqTizcoPARf5z7IpOThQnwKGOqDku amaevaiilno9FP5roqNZhGtGc0abUaAp/au8rb7o6bwfXiWVe9Zq/1S79gDNINI4qZv7 qmOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vs9kKFSy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m2si9342472pgq.424.2019.02.11.08.12.48; Mon, 11 Feb 2019 08:13:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=vs9kKFSy; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729038AbfBKOXl (ORCPT + 99 others); Mon, 11 Feb 2019 09:23:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:56716 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727054AbfBKOXi (ORCPT ); Mon, 11 Feb 2019 09:23:38 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0D176222AA; Mon, 11 Feb 2019 14:23:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549895017; bh=yb+7OU8AjDwtALOAyPqJSf3XJnC2ddy3gXsdSEkW/Aw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vs9kKFSyvJc5Mr+ZENgzJZTka2qAbnk9NOarCoFHYKQVceeNunUAhFq6JtVtIYXNy GTbtvVY9jTp/qebd6bxhaQTPmmGxzGbkp9SJwZRgAuXUHxHgwAuzfyvBtFoJB6xQFk RtmjJ05mkInYw7qlcaHrNWzCL45z6nLpD0FkTV0w= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.20 063/352] media: vivid: fill in media_device bus_info Date: Mon, 11 Feb 2019 15:14:50 +0100 Message-Id: <20190211141850.142407576@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141846.543045703@linuxfoundation.org> References: <20190211141846.543045703@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.20-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit e10b40f3304360d3a2d07d690ff12197f828f2c8 ] If you create multiple vivid instances, each with their own media device, then there was no way to tell them apart. Fill in the bus_info so each instance has a unique bus_info string. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/platform/vivid/vivid-core.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c index 626e2b24a403..ec1b1a8ea775 100644 --- a/drivers/media/platform/vivid/vivid-core.c +++ b/drivers/media/platform/vivid/vivid-core.c @@ -669,6 +669,8 @@ static int vivid_create_instance(struct platform_device *pdev, int inst) /* Initialize media device */ strlcpy(dev->mdev.model, VIVID_MODULE_NAME, sizeof(dev->mdev.model)); + snprintf(dev->mdev.bus_info, sizeof(dev->mdev.bus_info), + "platform:%s-%03d", VIVID_MODULE_NAME, inst); dev->mdev.dev = &pdev->dev; media_device_init(&dev->mdev); dev->mdev.ops = &vivid_media_ops; -- 2.19.1