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: 20780 Received: from mail.tu-berlin.de ([130.149.7.33]) by www.linuxtv.org with esmtp (Exim 4.72) (envelope-from ) id 1VjL6S-00036F-0r; Thu, 21 Nov 2013 04:38:52 +0100 X-tubIT-Incoming-IP: 209.132.180.67 Received: from vger.kernel.org ([209.132.180.67]) by mail.tu-berlin.de (exim-4.72/mailfrontend-6) with esmtp id 1VjL6O-0004da-3Q; Thu, 21 Nov 2013 04:38:51 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751506Ab3KUDiq (ORCPT + 1 other); 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-PMX-Version: 6.0.0.2142326, Antispam-Engine: 2.7.2.2107409, Antispam-Data: 2013.11.21.33014 X-PMX-Spam: Gauge=IIIIIIIII, Probability=9%, Report=' CN_TLD 0.1, FORGED_FROM_GMAIL 0.1, MULTIPLE_RCPTS 0.1, HTML_00_01 0.05, HTML_00_10 0.05, BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1000_1099 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DKIM_SIGNATURE 0, ECARD_WORD 0, URI_ENDS_IN_HTML 0, WEBMAIL_SOURCE 0, __ANY_URI 0, __CP_URI_IN_BODY 0, __CT 0, __CT_TEXT_PLAIN 0, __DATE_TZ_HK 0, __FRAUD_WEBMAIL 0, __FRAUD_WEBMAIL_FROM 0, __FROM_GMAIL 0, __HAS_FROM 0, __HAS_MSGID 0, __HAS_X_MAILING_LIST 0, __MIME_TEXT_ONLY 0, __MIME_VERSION 0, __MULTIPLE_RCPTS_CC_X2 0, __MULTIPLE_RCPTS_TO_X5 0, __PHISH_SPEAR_HTTP_RECEIVED 0, __PHISH_SPEAR_STRUCTURE_1 0, __PHISH_SPEAR_STRUCTURE_2 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0, __URI_NO_WWW 0, __URI_NS , __YOUTUBE_RCVD 0' 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--; }