From patchwork Mon Jun 3 18:12:04 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Frank_Sch=C3=A4fer?= X-Patchwork-Id: 2654171 Return-Path: X-Original-To: patchwork-linux-media@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 3062FDF24C for ; Mon, 3 Jun 2013 18:10:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759534Ab3FCSKi (ORCPT ); Mon, 3 Jun 2013 14:10:38 -0400 Received: from mail-ea0-f169.google.com ([209.85.215.169]:48027 "EHLO mail-ea0-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757041Ab3FCSKg (ORCPT ); Mon, 3 Jun 2013 14:10:36 -0400 Received: by mail-ea0-f169.google.com with SMTP id h15so1539277eak.14 for ; Mon, 03 Jun 2013 11:10:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=58jarCHEWlk39A+gWk5Fx1bDHEjvfGaEdzBj7LvYSaE=; b=lbioOCbewmZsvVW6hXo0o4dOnkebsl0hiUeOi6BtkloKMRCZ6MJJST5p9YgZRx8Tu+ tptfukO0QpvtQB8NzMt/Of6JTS+JKkv/mWGmAIPNz5NJArkpmwH7iGkmT8PYtZ4J6nuT lc5e5UjQDyXP3R+F6IsgmKEGpgHnS/+d9V7gTgyO3xLfO1w5+sRB8TKbjmZMnEPBmSym 45wtfnR7Q8+GQqLG02PHTB0SF/xhZCb66BTmVy8dz2JNF57vR/BmliuVoxcrnyDZHFE5 bI9KcUyvUUDX+i2Zd6Hnjdpbo7b3iitxSM26jXDHzaQBjUiUkqEc9xx6xo1WSv4vVXzI dcag== X-Received: by 10.14.201.7 with SMTP id a7mr10273436eeo.95.1370283034814; Mon, 03 Jun 2013 11:10:34 -0700 (PDT) Received: from Athlon64X2-5000.site (ip-5-146-108-238.unitymediagroup.de. [5.146.108.238]) by mx.google.com with ESMTPSA id f1sm58310886eem.17.2013.06.03.11.10.33 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Mon, 03 Jun 2013 11:10:34 -0700 (PDT) From: =?UTF-8?q?Frank=20Sch=C3=A4fer?= To: mchehab@redhat.com Cc: linux-media@vger.kernel.org, =?UTF-8?q?Frank=20Sch=C3=A4fer?= Subject: [PATCH 3/4] em28xx: move snapshot button bit definition for reg 0x0C from em28xx-input.c to em28xx.h Date: Mon, 3 Jun 2013 20:12:04 +0200 Message-Id: <1370283125-2231-4-git-send-email-fschaefer.oss@googlemail.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1370283125-2231-1-git-send-email-fschaefer.oss@googlemail.com> References: <1370283125-2231-1-git-send-email-fschaefer.oss@googlemail.com> MIME-Version: 1.0 Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org Signed-off-by: Frank Schäfer --- drivers/media/usb/em28xx/em28xx-input.c | 1 - drivers/media/usb/em28xx/em28xx-reg.h | 3 ++- 2 Dateien geändert, 2 Zeilen hinzugefügt(+), 2 Zeilen entfernt(-) diff --git a/drivers/media/usb/em28xx/em28xx-input.c b/drivers/media/usb/em28xx/em28xx-input.c index 466b19d..ea181e4 100644 --- a/drivers/media/usb/em28xx/em28xx-input.c +++ b/drivers/media/usb/em28xx/em28xx-input.c @@ -32,7 +32,6 @@ #define EM28XX_SNAPSHOT_KEY KEY_CAMERA #define EM28XX_SBUTTON_QUERY_INTERVAL 500 -#define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 static unsigned int ir_debug; module_param(ir_debug, int, 0644); diff --git a/drivers/media/usb/em28xx/em28xx-reg.h b/drivers/media/usb/em28xx/em28xx-reg.h index af39ddb..a88906c 100644 --- a/drivers/media/usb/em28xx/em28xx-reg.h +++ b/drivers/media/usb/em28xx/em28xx-reg.h @@ -68,7 +68,8 @@ #define EM28XX_R0A_CHIPID 0x0a -#define EM28XX_R0C_USBSUSP 0x0c /* */ +#define EM28XX_R0C_USBSUSP 0x0c +#define EM28XX_R0C_USBSUSP_SNAPSHOT 0x20 /* 1=button pressed, needs reset */ #define EM28XX_R0E_AUDIOSRC 0x0e #define EM28XX_R0F_XCLK 0x0f