From patchwork Thu Nov 21 03:38:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yongjun X-Patchwork-Id: 3216551 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.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 4D611C045B for ; Thu, 21 Nov 2013 03:38:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 56D3F2077F for ; Thu, 21 Nov 2013 03:38:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 92CBB2074B for ; Thu, 21 Nov 2013 03:38:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751506Ab3KUDiq (ORCPT ); Wed, 20 Nov 2013 22:38:46 -0500 Received: from mail-bk0-f52.google.com ([209.85.214.52]:53814 "EHLO mail-bk0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751420Ab3KUDip (ORCPT ); Wed, 20 Nov 2013 22:38:45 -0500 Received: by mail-bk0-f52.google.com with SMTP id u14so105119bkz.39 for ; Wed, 20 Nov 2013 19:38:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:date:message-id:subject:from:to:cc:content-type; bh=ZApbItL8TB+aoDXcVBvew/+DlVhSZMSFwjpw07k3EEE=; b=GFLdejf0Z69hFwHjc0+cVMdqGFbaGIOdOXZFjea0n9QMA8GJlhw1k0c0P9bS7V21sx r4jEA9/r+j1qQgueWUQsPx6zH3TZWSMXUhT5/URTkzFlmGSRj8xiWt3WT9IV5jmz9E70 B5k0uWZD7PFMWq0RdAmZpH1fTovraSryPAjclXenqbskVenHA2bCw3Xlw4D/SkHC+/Kl PGWVXWcLBvDqIGgnjEObIld8zXypxavZuN3aMfvib8VFSz66XQjUjwejaWUGsHQhUolX sOgmjA3uLwXc9DSKn1Xxps2VYYV46QeB2ruSw9oQTuK/2hyeKhvntuEQCi8CHJtKnR7C kIKg== MIME-Version: 1.0 X-Received: by 10.205.33.141 with SMTP id so13mr2417448bkb.24.1385005124238; Wed, 20 Nov 2013 19:38:44 -0800 (PST) Received: by 10.204.74.130 with HTTP; Wed, 20 Nov 2013 19:38:44 -0800 (PST) Date: Thu, 21 Nov 2013 11:38:44 +0800 Message-ID: Subject: [PATCH] [media] cx88: use correct pci drvdata type in cx88_audio_finidev() From: Wei Yongjun To: m.chehab@samsung.com, hans.verkuil@cisco.com, sachin.kamat@linaro.org, gregkh@linuxfoundation.org, michael.opdenacker@free-electrons.com Cc: yongjun_wei@trendmicro.com.cn, linux-media@vger.kernel.org Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham 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 From: Wei Yongjun We had set the pci drvdata in cx88_audio_initdev() as a type of struct snd_card, so cx88_audio_finidev() should used it as the same type too. Signed-off-by: Wei Yongjun --- drivers/media/pci/cx88/cx88-alsa.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/media/pci/cx88/cx88-alsa.c b/drivers/media/pci/cx88/cx88-alsa.c index 400eb1c..d014206e 100644 --- a/drivers/media/pci/cx88/cx88-alsa.c +++ b/drivers/media/pci/cx88/cx88-alsa.c @@ -931,9 +931,9 @@ error: */ static void cx88_audio_finidev(struct pci_dev *pci) { - struct cx88_audio_dev *card = pci_get_drvdata(pci); + struct snd_card *card = pci_get_drvdata(pci); - snd_card_free((void *)card); + snd_card_free(card); devno--; }