From f6da57e9f7de909b9c5f614a0f5f14789a3e0a69 Mon Sep 17 00:00:00 2001 From: James Bottomley Date: Fri, 12 Mar 2010 16:14:42 -0600 Subject: [PATCH] --- yaml --- r: 204170 b: refs/heads/master c: a91c1be21704113b023919826c6d531da46656ef h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/enclosure.c | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 1bcc4e5f66ab..da425577dc11 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: aac3118d33e275a7b1134cb19227c982f4d43877 +refs/heads/master: a91c1be21704113b023919826c6d531da46656ef diff --git a/trunk/drivers/misc/enclosure.c b/trunk/drivers/misc/enclosure.c index 48c84a58163e..00e5fcac8fdf 100644 --- a/trunk/drivers/misc/enclosure.c +++ b/trunk/drivers/misc/enclosure.c @@ -285,8 +285,11 @@ enclosure_component_register(struct enclosure_device *edev, cdev->groups = enclosure_groups; err = device_register(cdev); - if (err) - ERR_PTR(err); + if (err) { + ecomp->number = -1; + put_device(cdev); + return ERR_PTR(err); + } return ecomp; }