summaryrefslogtreecommitdiff
path: root/drivers/scsi/libsas/sas_init.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/scsi/libsas/sas_init.c')
-rw-r--r--drivers/scsi/libsas/sas_init.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/scsi/libsas/sas_init.c b/drivers/scsi/libsas/sas_init.c
index 8566bb1208a0..0bec236f0fb5 100644
--- a/drivers/scsi/libsas/sas_init.c
+++ b/drivers/scsi/libsas/sas_init.c
@@ -39,7 +39,7 @@ struct sas_task *sas_alloc_task(gfp_t flags)
struct sas_task *sas_alloc_slow_task(gfp_t flags)
{
struct sas_task *task = sas_alloc_task(flags);
- struct sas_task_slow *slow = kmalloc(sizeof(*slow), flags);
+ struct sas_task_slow *slow = kmalloc_obj(*slow, flags);
if (!task || !slow) {
if (task)
@@ -141,6 +141,7 @@ Undo_event_q:
Undo_ports:
sas_unregister_ports(sas_ha);
Undo_phys:
+ sas_unregister_phys(sas_ha);
return error;
}
@@ -504,7 +505,7 @@ static void phy_enable_work(struct work_struct *work)
static int sas_phy_setup(struct sas_phy *phy)
{
- struct sas_phy_data *d = kzalloc(sizeof(*d), GFP_KERNEL);
+ struct sas_phy_data *d = kzalloc_obj(*d);
if (!d)
return -ENOMEM;