pcmcia: correct handling for Zoomed Video registers in topic.h

Fix handling of Zoomed Video Registers in the Topic pcmcia controller ( http://bugzilla.kernel.org/show_bug.cgi?id=14581 ). The information has been retrieved from the Topic manual which can be obtained from Toshiba. The Zoomed Video is used with PCMCIA Cards like the Margi DVD-to-Go. [linux@dominikbrodowski.net: whitespace & commit message fix] Signed-off-by: Avi Cohen Stuart <avi.cohenstuart@infor.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>

pcmcia: correct handling for Zoomed Video registers in topic.h
Fix handling of Zoomed Video Registers in the Topic pcmcia controller ( http://bugzilla.kernel.org/show_bug.cgi?id=14581 ). The information has been retrieved from the Topic manual which can be obtained from Toshiba. The Zoomed Video is used with PCMCIA Cards like the Margi DVD-to-Go. [linux@dominikbrodowski.net: whitespace & commit message fix] Signed-off-by: Avi Cohen Stuart <avi.cohenstuart@infor.com> Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Avi Cohen Stuart · Dominik Brodowski
1 parent e657ea17ef
Showing 1 changed file with 5 additions and 10 deletions Side-by-side Diff
drivers/pcmcia/topic.h
@@ -114,22 +114,17 @@
 		reg_zv |= TOPIC97_ZV_CONTROL_ENABLE;
 		config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);
  
-		reg = config_readb(socket, TOPIC97_MISC2);
-		reg |= TOPIC97_MISC2_ZV_ENABLE;
-		config_writeb(socket, TOPIC97_MISC2, reg);
-
-		/* not sure this is needed, doc is unclear */
-#if 0
 		reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);
 		reg |= TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL;
 		config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);
-#endif
-	}
-	else {
+	} else {
 		reg_zv &= ~TOPIC97_ZV_CONTROL_ENABLE;
 		config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);
-	}
  
+		reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);
+		reg &= ~(TOPIC97_AVS_AUDIO_CONTROL | TOPIC97_AVS_VIDEO_CONTROL);
+		config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);
+	}
 }
  
 static int topic97_override(struct yenta_socket *socket)
...	...	@@ -114,22 +114,17 @@
114	114	reg_zv \|= TOPIC97_ZV_CONTROL_ENABLE;
115	115	config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);
116	116
117		- reg = config_readb(socket, TOPIC97_MISC2);
118		- reg \|= TOPIC97_MISC2_ZV_ENABLE;
119		- config_writeb(socket, TOPIC97_MISC2, reg);
120		-
121		- /* not sure this is needed, doc is unclear */
122		-#if 0
123	117	reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);
124	118	reg \|= TOPIC97_AVS_AUDIO_CONTROL \| TOPIC97_AVS_VIDEO_CONTROL;
125	119	config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);
126		-#endif
127		- }
128		- else {
	120	+ } else {
129	121	reg_zv &= ~TOPIC97_ZV_CONTROL_ENABLE;
130	122	config_writeb(socket, TOPIC97_ZOOM_VIDEO_CONTROL, reg_zv);
131		- }
132	123
	124	+ reg = config_readb(socket, TOPIC97_AUDIO_VIDEO_SWITCH);
	125	+ reg &= ~(TOPIC97_AVS_AUDIO_CONTROL \| TOPIC97_AVS_VIDEO_CONTROL);
	126	+ config_writeb(socket, TOPIC97_AUDIO_VIDEO_SWITCH, reg);
	127	+ }
133	128	}
134	129
135	130	static int topic97_override(struct yenta_socket *socket)