From 34de3192f815cc6a2c54cf2e00fa4009e20a56c5 Mon Sep 17 00:00:00 2001 From: "David S. Miller" Date: Wed, 27 Aug 2008 00:31:36 -0700 Subject: [PATCH] --- yaml --- r: 113013 b: refs/heads/master c: 12b1c03df10da61e222b86f0e1ece9cdb2a909d6 h: refs/heads/master i: 113011: ce600b52e0b02c264711013ede11c42c9c1f6205 v: v3 --- [refs] | 2 +- trunk/sound/sparc/cs4231.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index d19f25e62270..37b5e66c8881 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2bd320f89d417c370f4cf45470d102332c25ea24 +refs/heads/master: 12b1c03df10da61e222b86f0e1ece9cdb2a909d6 diff --git a/trunk/sound/sparc/cs4231.c b/trunk/sound/sparc/cs4231.c index 1c4797be72ee..e2be131723ed 100644 --- a/trunk/sound/sparc/cs4231.c +++ b/trunk/sound/sparc/cs4231.c @@ -1784,9 +1784,9 @@ static unsigned int sbus_dma_addr(struct cs4231_dma_control *dma_cont) static void sbus_dma_preallocate(struct snd_cs4231 *chip, struct snd_pcm *pcm) { - snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_SBUS, - snd_dma_sbus_data(chip->dev_u.sdev), - 64 * 1024, 128 * 1024); + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, + &chip->dev_u.sdev->ofdev.dev, + 64 * 1024, 128 * 1024); } /*