X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sound%2Fpci%2Fnm256%2Fnm256.c;h=ee3b246bbef0e5f6e838cde913719908ab1dcffc;hb=2cf7311f007833d5818fc9241c09a372c0325a4a;hp=0e42f2fccb643981d29ea021824b9ec59df75751;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/sound/pci/nm256/nm256.c b/sound/pci/nm256/nm256.c
index 0e42f2fcc..ee3b246bb 100644
--- 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 __user *dst,
+		       void *dst,
 		       snd_pcm_uframes_t count)
 {
 	snd_pcm_runtime_t *runtime = substream->runtime;
@@ -1188,7 +1188,7 @@ snd_nm256_ac97_reset(ac97_t *ac97)
 	/* Reset the mixer.  'Tis magic!  */
 	snd_nm256_writeb(chip, 0x6c0, 1);
 	if (chip->latitude_workaround) {
-		/* Dell Latitude LS will lock up on this */
+		/* Dell latitude LS will lock up by this */
 		snd_nm256_writeb(chip, 0x6cc, 0x87);
 	}
 	snd_nm256_writeb(chip, 0x6cc, 0x80);
@@ -1505,14 +1505,8 @@ snd_nm256_create(snd_card_t *card, struct pci_dev *pci,
 	chip->latitude_workaround = 1;
 	pci_read_config_word(pci, PCI_SUBSYSTEM_VENDOR_ID, &subsystem_vendor);
 	pci_read_config_word(pci, PCI_SUBSYSTEM_ID, &subsystem_device);
-	if (   (subsystem_vendor == 0x104d && subsystem_device == 0x8041)
-	    || (subsystem_vendor == 0x1028 && subsystem_device == 0x0080)) {
+	if (subsystem_vendor == 0x104d && subsystem_device == 0x8041) {
 		/* this workaround will cause lock-up after suspend/resume on Sony PCG-F305 */
-		/* It will also cause a lock-up on Latitude LS (PP01S Rev A2) whenever sound devices are accessed */
-		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;
 	}