Jelajahi Sumber

sound: OSS: ad1848 - Fix another typo

Fix another typo of || and &&.

Reported-by: Jörg-Volker Peetz <jvpeetz@web.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai 16 tahun lalu
induk
melakukan
b22f5d94c4
1 mengubah file dengan 1 tambahan dan 1 penghapusan
  1. 1 1
      sound/oss/ad1848.c

+ 1 - 1
sound/oss/ad1848.c

@@ -280,7 +280,7 @@ static void wait_for_calibration(ad1848_info * devc)
 	while (timeout > 0 && (ad_read(devc, 11) & 0x20))
 	while (timeout > 0 && (ad_read(devc, 11) & 0x20))
 		timeout--;
 		timeout--;
 	if (ad_read(devc, 11) & 0x20)
 	if (ad_read(devc, 11) & 0x20)
-		if ( (devc->model != MD_1845) || (devc->model != MD_1845_SSCAPE))
+		if ((devc->model != MD_1845) && (devc->model != MD_1845_SSCAPE))
 			printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n");
 			printk(KERN_WARNING "ad1848: Auto calibration timed out(3).\n");
 }
 }