projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'elevator-switch' of git://brick.kernel.dk/data/git/linux-2.6-block
[powerpc.git]
/
sound
/
core
/
memalloc.c
diff --git
a/sound/core/memalloc.c
b/sound/core/memalloc.c
index
39a54a4
..
129abab
100644
(file)
--- a/
sound/core/memalloc.c
+++ b/
sound/core/memalloc.c
@@
-106,7
+106,7
@@
struct snd_mem_list {
static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle,
static void *snd_dma_hack_alloc_coherent(struct device *dev, size_t size,
dma_addr_t *dma_handle,
-
unsigned int __nocas
t flags)
+
gfp_
t flags)
{
void *ret;
u64 dma_mask, coherent_dma_mask;
{
void *ret;
u64 dma_mask, coherent_dma_mask;
@@
-190,7
+190,7
@@
static void unmark_pages(struct page *page, int order)
*
* Returns the pointer of the buffer, or NULL if no enoguh memory.
*/
*
* Returns the pointer of the buffer, or NULL if no enoguh memory.
*/
-void *snd_malloc_pages(size_t size,
unsigned in
t gfp_flags)
+void *snd_malloc_pages(size_t size,
gfp_
t gfp_flags)
{
int pg;
void *res;
{
int pg;
void *res;
@@
-235,7
+235,7
@@
static void *snd_malloc_dev_pages(struct device *dev, size_t size, dma_addr_t *d
{
int pg;
void *res;
{
int pg;
void *res;
-
unsigned in
t gfp_flags;
+
gfp_
t gfp_flags;
snd_assert(size > 0, return NULL);
snd_assert(dma != NULL, return NULL);
snd_assert(size > 0, return NULL);
snd_assert(dma != NULL, return NULL);
@@
-590,7
+590,7
@@
static int snd_mem_proc_write(struct file *file, const char __user *buffer,
alloced = 0;
pci = NULL;
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) {
if (mask > 0 && mask < 0xffffffff) {
if (pci_set_dma_mask(pci, mask) < 0 ||
pci_set_consistent_dma_mask(pci, mask) < 0) {
@@
-604,6
+604,7
@@
static int snd_mem_proc_write(struct file *file, const char __user *buffer,
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);
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));
return (int)count;
}
snd_dma_reserve_buf(&dmab, snd_dma_pci_buf_id(pci));