From patchwork Sun Sep 13 03:22:41 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ellingsworth X-Patchwork-Id: 47121 X-Patchwork-Delegate: dougsland@redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n8D3Mqe0004988 for ; Sun, 13 Sep 2009 03:22:52 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754761AbZIMDWs (ORCPT ); Sat, 12 Sep 2009 23:22:48 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754741AbZIMDWs (ORCPT ); Sat, 12 Sep 2009 23:22:48 -0400 Received: from qw-out-2122.google.com ([74.125.92.27]:45517 "EHLO qw-out-2122.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754620AbZIMDWr (ORCPT ); Sat, 12 Sep 2009 23:22:47 -0400 Received: by qw-out-2122.google.com with SMTP id 9so721299qwb.37 for ; Sat, 12 Sep 2009 20:22:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:sender:message-id:date:from :reply-to:user-agent:mime-version:to:subject:content-type; bh=t8LX7K9X6P0A6QXpyQI8rDLA0LawoaTs/ImHjrmpbIk=; b=dSNHdzGrVCgLvYFOvWrdgrITezsfOSHGgBKZSGLHPIwZUqi1XAiVTxFYDinAqi0uV3 j8Mc2JaOEMJc3d+Z2IzJA7H2yjDRijszmAz457KgF6DkM2dzCnlwOE5iqQlv6rkLFg4F +wxRIOpVNMC2MHm+wfcTPK2DiRYb2MgaqPIA4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:message-id:date:from:reply-to:user-agent:mime-version:to :subject:content-type; b=H1YQNG5J8jyU8oW0MydFpYNnIXTYh1LrRUgzNwN13ULKf6Y3QGXIbicp/qutOMqwWs bYksQQ1YwL1mX/x8eXl6W0pt6UkxQmrpJRX34NPf49IuG94jzNaJ4LwZsA4R5K5gMqrU labeihtYQ9UunyzBKJA7zbvTUT+Ha7xkf6awI= Received: by 10.224.108.5 with SMTP id d5mr4086137qap.294.1252812170731; Sat, 12 Sep 2009 20:22:50 -0700 (PDT) Received: from ?192.168.10.110? (cpe-71-72-62-249.neo.res.rr.com [71.72.62.249]) by mx.google.com with ESMTPS id 6sm3178327qwd.13.2009.09.12.20.22.49 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sat, 12 Sep 2009 20:22:50 -0700 (PDT) Message-ID: <4AAC6581.40103@gmail.com> Date: Sat, 12 Sep 2009 23:22:41 -0400 From: David Ellingsworth Reply-To: david@identd.dyndns.org User-Agent: Mozilla-Thunderbird 2.0.0.22 (X11/20090701) MIME-Version: 1.0 To: linux-media@vger.kernel.org, klimov.linux@gmail.com Subject: [RFC/RFT 09/14] radio-mr800: remove device initialization from open/close Sender: linux-media-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org From 8c441616f67011244cb15bc1a3dda6fd8706ecd2 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Sat, 12 Sep 2009 16:04:44 -0400 Subject: [PATCH 08/14] mr800: fix potential use after free Signed-off-by: David Ellingsworth --- drivers/media/radio/radio-mr800.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) /* vidioc_querycap - query device capabilities */ From 5d01d49c78e2788dca8981af7369c799b650c706 Mon Sep 17 00:00:00 2001 From: David Ellingsworth Date: Sat, 12 Sep 2009 16:28:45 -0400 Subject: [PATCH 09/14] mr800: remove device initialization from open/close Device initialization should happen on an as needed basis. This change allows the device to continue operating even when there are no applications using it. This should allow simple command based applications to turn the device on and off without a persistent process. Signed-off-by: David Ellingsworth --- drivers/media/radio/radio-mr800.c | 35 ++--------------------------------- 1 files changed, 2 insertions(+), 33 deletions(-) diff --git a/drivers/media/radio/radio-mr800.c b/drivers/media/radio/radio-mr800.c index 87b58e3..df020e8 100644 --- a/drivers/media/radio/radio-mr800.c +++ b/drivers/media/radio/radio-mr800.c @@ -136,7 +136,6 @@ struct amradio_device { struct mutex lock; /* buffer locking */ int curfreq; int stereo; - int users; int muted; }; @@ -492,26 +491,6 @@ static int usb_amradio_open(struct file *file) } file->private_data = radio; - radio->users = 1; - radio->muted = 1; - - retval = amradio_set_mute(radio, AMRADIO_START); - if (retval < 0) { - amradio_dev_warn(&radio->videodev.dev, - "radio did not start up properly\n"); - radio->users = 0; - goto unlock; - } - - retval = amradio_set_stereo(radio, WANT_STEREO); - if (retval < 0) - amradio_dev_warn(&radio->videodev.dev, - "set stereo failed\n"); - - retval = amradio_setfreq(radio, radio->curfreq); - if (retval < 0) - amradio_dev_warn(&radio->videodev.dev, - "set frequency failed\n"); unlock: mutex_unlock(&radio->lock); @@ -526,19 +505,9 @@ static int usb_amradio_close(struct file *file) mutex_lock(&radio->lock); - if (!radio->usbdev) { + if (!radio->usbdev) retval = -EIO; - goto unlock; - } - - radio->users = 0; - retval = amradio_set_mute(radio, AMRADIO_STOP); - if (retval < 0) - amradio_dev_warn(&radio->videodev.dev, - "amradio_stop failed\n"); - -unlock: mutex_unlock(&radio->lock); return retval; } @@ -669,10 +638,10 @@ static int usb_amradio_probe(struct usb_interface *intf, radio->videodev.ioctl_ops = &usb_amradio_ioctl_ops; radio->videodev.release = usb_amradio_video_device_release; - radio->users = 0; radio->usbdev = interface_to_usbdev(intf); radio->curfreq = 95.16 * FREQ_MUL; radio->stereo = -1; + radio->muted = 1; mutex_init(&radio->lock); -- 1.6.3.3