VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)

[linux-2.6.git] / sound / pci / nm256 / nm256.c

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index ee3b246..5637e0b 100644 (file)
--- a/sound/pci/nm256/nm256.c
+++ b/sound/pci/nm256/nm256.c
@@ -703,7 +703,7 @@ static int
 snd_nm256_capture_copy(snd_pcm_substream_t *substream,
                       int channel, /* not used (interleaved data) */
                       snd_pcm_uframes_t pos,
-                      void *dst,
+                      void __user *dst,
                       snd_pcm_uframes_t count)
 {
        snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1509,6 +1509,10 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
                /* this workaround will cause lock-up after suspend/resume on Sony PCG-F305 */
                chip->latitude_workaround = 0;
        }
+       if (subsystem_vendor == 0x1028 && subsystem_device == 0x0080) {
+               /* this workaround will cause lock-up after suspend/resume on a Dell laptop */
+               chip->latitude_workaround = 0;
+       }
 
        snd_nm256_init_chip(chip);