Merge branches 'misc', 'sa1100-for-next' and 'spectre' into for-linus

[linux-2.6-microblaze.git] / drivers / pcmcia / sa1100_simpad.c

diff --git a/drivers/pcmcia/sa1100_simpad.c b/drivers/pcmcia/sa1100_simpad.c
index e235ee1..e2e8729 100644 (file)
--- a/drivers/pcmcia/sa1100_simpad.c
+++ b/drivers/pcmcia/sa1100_simpad.c
@@ -39,8 +39,8 @@ simpad_pcmcia_socket_state(struct soc_pcmcia_socket *skt,
 {
        long cs3reg = simpad_get_cs3_ro();
 
-       state->bvd1 = 1; /* Might be cs3reg & PCMCIA_BVD1 */
-       state->bvd2 = 1; /* Might be cs3reg & PCMCIA_BVD2 */
+       /* bvd1 might be cs3reg & PCMCIA_BVD1 */
+       /* bvd2 might be cs3reg & PCMCIA_BVD2 */
 
        if ((cs3reg & (PCMCIA_VS1|PCMCIA_VS2)) ==
                        (PCMCIA_VS1|PCMCIA_VS2)) {