[ARM] 3216/1: indent and typo in drivers/serial/pxa.c

[linux-2.6-omap-h63xx.git] / drivers / pcmcia / cs.c

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d5e76423a0ee89b15a3888e0b411f688e49b05fb..a30aa74304a2712f946614093552ab117ba22507 100644 (file)
--- a/drivers/pcmcia/cs.c
+++ b/drivers/pcmcia/cs.c
@@ -331,10 +331,8 @@ static void shutdown_socket(struct pcmcia_socket *s)
        cb_free(s);
 #endif
        s->functions = 0;
-       if (s->config) {
-               kfree(s->config);
-               s->config = NULL;
-       }
+       kfree(s->config);
+       s->config = NULL;
 
        {
                int status;
@@ -515,6 +513,11 @@ static int socket_insert(struct pcmcia_socket *skt)
        ret = socket_setup(skt, setup_delay);
        if (ret == CS_SUCCESS) {
                skt->state |= SOCKET_PRESENT;
+
+               printk(KERN_NOTICE "pccard: %s card inserted into slot %d\n",
+                      (skt->state & SOCKET_CARDBUS) ? "CardBus" : "PCMCIA",
+                      skt->sock);
+
 #ifdef CONFIG_CARDBUS
                if (skt->state & SOCKET_CARDBUS) {
                        cb_alloc(skt);
@@ -600,6 +603,7 @@ static int socket_resume(struct pcmcia_socket *skt)
 
 static void socket_remove(struct pcmcia_socket *skt)
 {
+       printk(KERN_NOTICE "pccard: card ejected from slot %d\n", skt->sock);
        socket_shutdown(skt);
        cs_socket_put(skt);
 }