From 768a34949a0bb65a61256f233e882f885b7489a7 Mon Sep 17 00:00:00 2001 From: Alexey Khoroshilov Date: Thu, 16 Aug 2012 17:05:38 -0300 Subject: [PATCH] --- yaml --- r: 330929 b: refs/heads/master c: f4e4a67a37e7c9624b3e8bb9655db2ae45243f3d h: refs/heads/master i: 330927: 449360dd818788017b23dbf37b28783a2c2af4d0 v: v3 --- [refs] | 2 +- trunk/drivers/media/pci/ddbridge/ddbridge-core.c | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 47b6160eb8d0..bfad9c9879a5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4b83a7a75375f9d5edd1fb0067986a0f23695ddd +refs/heads/master: f4e4a67a37e7c9624b3e8bb9655db2ae45243f3d diff --git a/trunk/drivers/media/pci/ddbridge/ddbridge-core.c b/trunk/drivers/media/pci/ddbridge/ddbridge-core.c index ebf3f05839d2..feff57ee5a08 100644 --- a/trunk/drivers/media/pci/ddbridge/ddbridge-core.c +++ b/trunk/drivers/media/pci/ddbridge/ddbridge-core.c @@ -1497,7 +1497,7 @@ static int ddb_class_create(void) ddb_class = class_create(THIS_MODULE, DDB_NAME); if (IS_ERR(ddb_class)) { unregister_chrdev(ddb_major, DDB_NAME); - return -1; + return PTR_ERR(ddb_class); } ddb_class->devnode = ddb_devnode; return 0; @@ -1701,11 +1701,18 @@ static struct pci_driver ddb_pci_driver = { static __init int module_init_ddbridge(void) { + int ret; + printk(KERN_INFO "Digital Devices PCIE bridge driver, " "Copyright (C) 2010-11 Digital Devices GmbH\n"); - if (ddb_class_create()) - return -1; - return pci_register_driver(&ddb_pci_driver); + + ret = ddb_class_create(); + if (ret < 0) + return ret; + ret = pci_register_driver(&ddb_pci_driver); + if (ret < 0) + ddb_class_destroy(); + return ret; } static __exit void module_exit_ddbridge(void)