Merge branch 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[karo-tx-linux.git] / drivers / pcmcia / topic.h

diff --git a/drivers/pcmcia/topic.h b/drivers/pcmcia/topic.h
index edccfa5bb40087b0a0b9cbefae7bdbae5d781348..615a45a8fe8674fe4d920d87884bde653f2e3b3a 100644 (file)
--- a/drivers/pcmcia/topic.h
+++ b/drivers/pcmcia/topic.h
@@ -114,22 +114,17 @@ static void topic97_zoom_video(struct pcmcia_socket *sock, int onoff)
                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)