Merge branch 'upstream'

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c
index d5e76423a0ee..234cdca6fe13 100644
--- 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;