diff options
| author | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-11-09 21:47:47 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2008-11-09 21:47:47 +0100 |
| commit | b1769450da0eeae2d95aae5496acbdf4c6ba89b2 (patch) | |
| tree | b1af5fde17a80d1b4742053145a93140eb5aeb16 /drivers/pcmcia/cs.c | |
| parent | 980fc29f20f5cfb8cef29ddfccecb685f299ada4 (diff) | |
| download | kernel_goldelico_gta04-b1769450da0eeae2d95aae5496acbdf4c6ba89b2.zip kernel_goldelico_gta04-b1769450da0eeae2d95aae5496acbdf4c6ba89b2.tar.gz kernel_goldelico_gta04-b1769450da0eeae2d95aae5496acbdf4c6ba89b2.tar.bz2 | |
pcmcia: ensure correct logging in do_io_probe
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/cs.c')
| -rw-r--r-- | drivers/pcmcia/cs.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/pcmcia/cs.c b/drivers/pcmcia/cs.c index 5d0e60e..0660ad1 100644 --- a/drivers/pcmcia/cs.c +++ b/drivers/pcmcia/cs.c @@ -186,12 +186,6 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) spin_lock_init(&socket->lock); - if (socket->resource_ops->init) { - ret = socket->resource_ops->init(socket); - if (ret) - return (ret); - } - /* try to obtain a socket number [yes, it gets ugly if we * register more than 2^sizeof(unsigned int) pcmcia * sockets... but the socket number is deprecated @@ -239,6 +233,12 @@ int pcmcia_register_socket(struct pcmcia_socket *socket) mutex_init(&socket->skt_mutex); spin_lock_init(&socket->thread_lock); + if (socket->resource_ops->init) { + ret = socket->resource_ops->init(socket); + if (ret) + goto err; + } + tsk = kthread_run(pccardd, socket, "pccardd"); if (IS_ERR(tsk)) { ret = PTR_ERR(tsk); |