Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[CONNECTOR]: Initialize subsystem earlier.

Browse source 
Attached patch declares connector init function as subsys_init()
and returns -EAGAIN in case connector is not initialized yet.

Signed-off-by: Evgeniy Polyakov <johnpol@2ka.mipt.ru>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Evgeniy Polyakov 2006-06-19 23:42:53 -07:00 committed by David S. Miller
parent d3dcd4efe2
commit d6cc7f1a3b
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/connector/connector.c
View file

@ -308,6 +308,9 @@ int cn_add_callback(struct cb_id *id, char *name, void (*callback)(void *))
int err; int err;
struct cn_dev *dev = &cdev; struct cn_dev *dev = &cdev;
if (!cn_already_initialized)
return -EAGAIN;
err = cn_queue_add_callback(dev->cbdev, name, id, callback); err = cn_queue_add_callback(dev->cbdev, name, id, callback);
if (err) if (err)
return err; return err;
@ -435,7 +438,7 @@ static void cn_callback(void *data)
mutex_unlock(&notify_lock); mutex_unlock(&notify_lock);
} }
static int __init cn_init(void) static int __devinit cn_init(void)
{ {
struct cn_dev *dev = &cdev; struct cn_dev *dev = &cdev;
int err; int err;
@ -456,21 +459,22 @@ static int __init cn_init(void)
sock_release(dev->nls->sk_socket); sock_release(dev->nls->sk_socket);
return -EINVAL; return -EINVAL;
} }
cn_already_initialized = 1;
err = cn_add_callback(&dev->id, "connector", &cn_callback); err = cn_add_callback(&dev->id, "connector", &cn_callback);
if (err) { if (err) {
cn_already_initialized = 0;
cn_queue_free_dev(dev->cbdev); cn_queue_free_dev(dev->cbdev);
if (dev->nls->sk_socket) if (dev->nls->sk_socket)
sock_release(dev->nls->sk_socket); sock_release(dev->nls->sk_socket);
return -EINVAL; return -EINVAL;
} }
cn_already_initialized = 1;
return 0; return 0;
} }
static void __exit cn_fini(void) static void __devexit cn_fini(void)
{ {
struct cn_dev *dev = &cdev; struct cn_dev *dev = &cdev;
@ -482,7 +486,7 @@ static void __exit cn_fini(void)
sock_release(dev->nls->sk_socket); sock_release(dev->nls->sk_socket);
} }
module_init(cn_init); subsys_initcall(cn_init);
module_exit(cn_fini); module_exit(cn_fini);
EXPORT_SYMBOL_GPL(cn_add_callback); EXPORT_SYMBOL_GPL(cn_add_callback);