From: Jiri Slaby <jirislaby@gmail.com>
To: Greg KH <gregkh@suse.de>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
linux-pci@atrey.karlin.mff.cuni.cz, alsa-devel@alsa-project.org,
perex@suse.cz
Subject: [PATCH 2/6] include, sound: pci_find_device remove (s/core/memalloc.c)
Date: Fri, 2 Sep 2005 23:44:55 +0200 [thread overview]
Message-ID: <200509022144.j82LitUL031342@wscnet.wsc.cz> (raw)
In-Reply-To: <200509022122.j82LMMwV030426@wscnet.wsc.cz>
Generated in 2.6.13-mm1 kernel version.
Signed-off-by: Jiri Slaby <xslaby@fi.muni.cz>
memalloc.c | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/sound/core/memalloc.c b/sound/core/memalloc.c
--- a/sound/core/memalloc.c
+++ b/sound/core/memalloc.c
@@ -567,8 +567,8 @@ static int snd_mem_proc_write(struct fil
char *endp;
int vendor, device, size, buffers;
long mask;
- int i, alloced;
- struct pci_dev *pci;
+ int i, alloced = 0;
+ struct pci_dev *pci = NULL;
if ((token = gettoken(&p)) == NULL ||
(vendor = simple_strtol(token, NULL, 0)) <= 0 ||
@@ -588,13 +588,12 @@ static int snd_mem_proc_write(struct fil
vendor &= 0xffff;
device &= 0xffff;
- alloced = 0;
- pci = NULL;
- while ((pci = pci_find_device(vendor, device, pci)) != NULL) {
+ while ((pci = pci_get_device(vendor, device, pci)) != NULL) {
if (mask > 0 && mask < 0xffffffff) {
if (pci_set_dma_mask(pci, mask) < 0 ||
pci_set_consistent_dma_mask(pci, mask) < 0) {
printk(KERN_ERR "snd-page-alloc: cannot set DMA mask %lx for pci %04x:%04x\n", mask, vendor, device);
+ pci_dev_put(pci);
return (int)count;
}
}
@@ -604,6 +603,7 @@ static int snd_mem_proc_write(struct fil
if (snd_dma_alloc_pages(SNDRV_DMA_TYPE_DEV, snd_dma_pci_data(pci),
size, &dmab) < 0) {
printk(KERN_ERR "snd-page-alloc: cannot allocate buffer pages (size = %d)\n", size);
+ pci_dev_put(pci);
return (int)count;
}
snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci));
next prev parent reply other threads:[~2005-09-02 21:46 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-02 21:22 [PATCH 0/6] include, sound: pci_find_device remove Jiri Slaby
2005-09-02 21:44 ` [PATCH 3/6] include, sound: pci_find_device remove (s/pci/ali5451/ali5451.c) Jiri Slaby
2005-09-02 21:44 ` [PATCH 6/6] include, sound: pci_find_device remove (s/pci/via82xx.c) Jiri Slaby
2005-09-07 13:29 ` [Alsa-devel] " Takashi Iwai
2005-09-02 21:44 ` Jiri Slaby [this message]
2005-09-02 21:44 ` [PATCH 4/6] include, sound: pci_find_device remove (s/pci/au88x0/au88x0.c) Jiri Slaby
2005-09-02 21:44 ` [PATCH 5/6] include, sound: pci_find_device remove (s/pci/cs46xx/cs46xx_lib.c) Jiri Slaby
2005-09-02 21:45 ` [PATCH 1/6] include, sound: pci_find_device remove (include/asm-i386/ide.h) Jiri Slaby
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200509022144.j82LitUL031342@wscnet.wsc.cz \
--to=jirislaby@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=gregkh@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@atrey.karlin.mff.cuni.cz \
--cc=perex@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®