From patchwork Sat Feb 27 13:40:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 8444591 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 663D9C0553 for ; Sat, 27 Feb 2016 13:40:41 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 525BB203C4 for ; Sat, 27 Feb 2016 13:40:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 622AA203E6 for ; Sat, 27 Feb 2016 13:40:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756383AbcB0Nke (ORCPT ); Sat, 27 Feb 2016 08:40:34 -0500 Received: from mx1.redhat.com ([209.132.183.28]:57567 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756332AbcB0Nkd (ORCPT ); Sat, 27 Feb 2016 08:40:33 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id E80BF19D228; Sat, 27 Feb 2016 13:40:32 +0000 (UTC) Received: from shalem.localdomain.com (vpn1-7-37.ams2.redhat.com [10.36.7.37]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u1RDeRkS020971; Sat, 27 Feb 2016 08:40:30 -0500 From: Hans de Goede To: Gregor Jasny Cc: Linux Media Mailing List , istaff124@gmail.com, Hans de Goede Subject: [PATCH] v4lconvert: Add "PEGATRON CORPORATION" to asus_board_vendor Date: Sat, 27 Feb 2016 14:40:24 +0100 Message-Id: <1456580424-9627-2-git-send-email-hdegoede@redhat.com> In-Reply-To: <1456580424-9627-1-git-send-email-hdegoede@redhat.com> References: <1456580424-9627-1-git-send-email-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Some Asus laptops actually have "PEGATRON CORPORATION" in board_vendor, add this to the list of strings used to recognize Asus as vendor. This also allows us to remove a bunch of PEGATRON entries from the static v4lcontrol_flags table. Note that 2 PEGATRON entries remain in the static v4lcontrol_flags table, one for a "H54" board_name entry since "H54" is not in the asus_board_name array, and one "PEGATRON CORP." board which does not have a usable board_name at all. BugLink: https://bugzilla.redhat.com/show_bug.cgi?id=1311545 Signed-off-by: Hans de Goede --- lib/libv4lconvert/control/libv4lcontrol.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/lib/libv4lconvert/control/libv4lcontrol.c b/lib/libv4lconvert/control/libv4lcontrol.c index e1832a9..0c45a26 100644 --- a/lib/libv4lconvert/control/libv4lcontrol.c +++ b/lib/libv4lconvert/control/libv4lcontrol.c @@ -75,9 +75,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = { /* A re-branded ASUS notebook */ { 0x04f2, 0xb012, 0, "Founder PC", "T14MF", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, - /* Note no whitespace padding for board vendor, this is not a typo */ - { 0x04f2, 0xb012, 0, "PEGATRON CORPORATION", "X71TL ", - V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, /* These 3 PACKARD BELL's seem to be Asus notebook in disguise */ { 0x04f2, 0xb012, 0, "Packard Bell BV", "T32A ", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, @@ -152,10 +149,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = { { 0x064e, 0xa111, 0, "Acer, Inc.", "Prespa1 ", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0, "Acer, inc.", "Aspire 5570 " }, - { 0x064e, 0xa111, 0, "PEGATRON CORPORATION ", "F5C ", - V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, - { 0x064e, 0xa111, 0, "PEGATRON CORPORATION ", "F5SR ", - V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, /* 2 reports: Unknown laptop model -> System Vendor: " IDEALMAX" Síragon SL-6120 -> System Vendor: "PEGA PC" @@ -165,8 +158,6 @@ static const struct v4lcontrol_flags_info v4lcontrol_flags[] = { NULL, "H34" }, { 0x064e, 0xa212, 0, "MEDIONAG", "WeTab ", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, - { 0x174f, 0x5a35, 0, "PEGATRON CORPORATION ", "F5SL ", - V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED }, { 0x174f, 0x6a51, 0, NULL, "S96S", V4LCONTROL_HFLIPPED | V4LCONTROL_VFLIPPED, 0, "MicroLink", "S96S" }, @@ -270,6 +261,7 @@ static const char *asus_board_vendor[] = { "ASUSTeK Computer Inc.", "ASUSTeK Computer INC.", "ASUS CORPORATION", + "PEGATRON CORPORATION", NULL }; static const char *asus_board_name[] = {