From c63237f75b79e3aa9475a1468665f407c1bf3c86 Mon Sep 17 00:00:00 2001 From: Devendra Naga Date: Mon, 6 Aug 2012 02:59:56 +0545 Subject: [PATCH] --- yaml --- r: 324493 b: refs/heads/master c: 675fe097568894708afd3b264e4122589e879f40 h: refs/heads/master i: 324491: 45989bbea65e2170f1948369505743de2e0d70c8 v: v3 --- [refs] | 2 +- trunk/drivers/staging/crystalhd/crystalhd_lnx.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index bb6c24351aea..7f5b78a555d9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3b2f1fbec9218f24425eaaeedd4fd3e6ef3e9f44 +refs/heads/master: 675fe097568894708afd3b264e4122589e879f40 diff --git a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c b/trunk/drivers/staging/crystalhd/crystalhd_lnx.c index 0582ac04b75c..5909d8d1b4d5 100644 --- a/trunk/drivers/staging/crystalhd/crystalhd_lnx.c +++ b/trunk/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 @@ static int __devinit chd_dec_init_chdev(struct crystalhd_adp *adp) 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; }