From 389a968c63511d34892d597961bb966bc6275637 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Sun, 14 Apr 2013 12:47:57 -0300 Subject: [PATCH] --- yaml --- r: 367185 b: refs/heads/master c: 486a7a2813c7d6e0b864c4b51027bcae3359071e h: refs/heads/master i: 367183: 300f7a810efae47fd1067c6f10beb5066136afff v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/cx25821/Makefile | 3 +-- trunk/drivers/media/pci/cx25821/cx25821-core.c | 2 -- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1e4b29b9e437..f723a418661b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ea3f7ac6e931f9aaa45e0a8445406f14e2a62011 +refs/heads/master: 486a7a2813c7d6e0b864c4b51027bcae3359071e diff --git a/trunk/drivers/media/pci/cx25821/Makefile b/trunk/drivers/media/pci/cx25821/Makefile index 407830c89df4..fb76c3d3713a 100644 --- a/trunk/drivers/media/pci/cx25821/Makefile +++ b/trunk/drivers/media/pci/cx25821/Makefile @@ -1,7 +1,6 @@ cx25821-y := cx25821-core.o cx25821-cards.o cx25821-i2c.o \ cx25821-gpio.o cx25821-medusa-video.o \ - cx25821-video.o cx25821-video-upstream.o \ - cx25821-audio-upstream.o + cx25821-video.o cx25821-video-upstream.o obj-$(CONFIG_VIDEO_CX25821) += cx25821.o obj-$(CONFIG_VIDEO_CX25821_ALSA) += cx25821-alsa.o diff --git a/trunk/drivers/media/pci/cx25821/cx25821-core.c b/trunk/drivers/media/pci/cx25821/cx25821-core.c index 35bea792b5e4..b762c5b2ca10 100644 --- a/trunk/drivers/media/pci/cx25821/cx25821-core.c +++ b/trunk/drivers/media/pci/cx25821/cx25821-core.c @@ -964,8 +964,6 @@ void cx25821_dev_unregister(struct cx25821_dev *dev) if (!dev->base_io_addr) return; - cx25821_free_mem_upstream_audio(dev); - release_mem_region(dev->base_io_addr, pci_resource_len(dev->pci, 0)); for (i = 0; i < MAX_VID_CHANNEL_NUM - 1; i++) {