Merge remote-tracking branch 'samsung/for-next'

[karo-tx-linux.git] / drivers / pcmcia / pd6729.c

diff --git a/drivers/pcmcia/pd6729.c b/drivers/pcmcia/pd6729.c
index 34ace4854dc242513730582b5a51bbcdaf730cce..0f70b4d58f9e7c2d8bb2b9b6c0dc00d2dca3f308 100644 (file)
--- a/drivers/pcmcia/pd6729.c
+++ b/drivers/pcmcia/pd6729.c
@@ -707,11 +707,9 @@ static int pd6729_pci_probe(struct pci_dev *dev,
                }
        } else {
                /* poll Card status change */
-               init_timer(&socket->poll_timer);
-               socket->poll_timer.function = pd6729_interrupt_wrapper;
-               socket->poll_timer.data = (unsigned long)socket;
-               socket->poll_timer.expires = jiffies + HZ;
-               add_timer(&socket->poll_timer);
+               setup_timer(&socket->poll_timer, pd6729_interrupt_wrapper,
+                           (unsigned long)socket);
+               mod_timer(&socket->poll_timer, jiffies + HZ);
        }
 
        for (i = 0; i < MAX_SOCKETS; i++) {