Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 7603935838ae3a85b56f0b5662ab785518d68d39

Authored by Arnd Bergmann
Committed by Takashi Iwai
1 parent 2fc565e4ea
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

ALSA: ali5451: use mdelay instead of large udelay constants 

ARM cannot handle udelay for more than 2 miliseconds, so we
should use mdelay instead for those.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

Showing 1 changed file with 4 additions and 4 deletions Side-by-side Diff

sound/pci/ali5451/ali5451.c
Diff comments   View file @ 7603935
... ... @@ -451,10 +451,10 @@
451 451 if (pci_dev) {
452 452 pci_read_config_dword(pci_dev, 0x7c, &dwVal);
453 453 pci_write_config_dword(pci_dev, 0x7c, dwVal | 0x08000000);
454   - udelay(5000);
  454 + mdelay(5);
455 455 pci_read_config_dword(pci_dev, 0x7c, &dwVal);
456 456 pci_write_config_dword(pci_dev, 0x7c, dwVal & 0xf7ffffff);
457   - udelay(5000);
  457 + mdelay(5);
458 458 }
459 459  
460 460 pci_dev = codec->pci;
461 461  
... ... @@ -463,14 +463,14 @@
463 463 udelay(500);
464 464 pci_read_config_dword(pci_dev, 0x44, &dwVal);
465 465 pci_write_config_dword(pci_dev, 0x44, dwVal & 0xfffbffff);
466   - udelay(5000);
  466 + mdelay(5);
467 467  
468 468 wCount = 200;
469 469 while(wCount--) {
470 470 wReg = snd_ali_codec_peek(codec, 0, AC97_POWERDOWN);
471 471 if ((wReg & 0x000f) == 0x000f)
472 472 return 0;
473   - udelay(5000);
  473 + mdelay(5);
474 474 }
475 475  
476 476 /* non-fatal if you have a non PM capable codec */