From: Devendra Naga Date: Sun, 5 Aug 2012 21:14:56 +0000 (+0545) Subject: staging/crystalhd: unregister chardev when class_create fails in chd_dec_init_chdev X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=675fe097568894708afd3b264e4122589e879f40;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git staging/crystalhd: unregister chardev when class_create fails in chd_dec_init_chdev we missed a unregiser_chrdev if the class_create and subsequent function calls / checks fail Signed-off-by: Devendra Naga Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/staging/crystalhd/crystalhd_lnx.c b/drivers/staging/crystalhd/crystalhd_lnx.c index 0582ac04b75c..5909d8d1b4d5 100644 --- a/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/drivers/staging/crystalhd/crystalhd_lnx.c @@ -375,7 +375,7 @@ static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp) if (IS_ERR(crystalhd_class)) { rc = PTR_ERR(crystalhd_class); BCMLOG_ERR("failed to create class\n"); - goto fail; + goto class_create_fail; } dev = device_create(crystalhd_class, NULL, MKDEV(adp->chd_dec_major, 0), @@ -412,6 +412,8 @@ elem_pool_fail: device_destroy(crystalhd_class, MKDEV(adp->chd_dec_major, 0)); device_create_fail: class_destroy(crystalhd_class); +class_create_fail: + unregister_chrdev(adp->chd_dec_major, CRYSTALHD_API_NAME); fail: return rc; }