From 584d4debd5b7b799a411e8c0b365e2b17b4ea160 Mon Sep 17 00:00:00 2001 From: Julia Lawall Date: Wed, 10 Mar 2010 15:20:42 -0800 Subject: [PATCH] --- yaml --- r: 187118 b: refs/heads/master c: 9b3a6549b2602ca30f58715a0071e29f9898cae9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/scsi/ses.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 800ba8ac6489..e8bcc9a74d6e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2d30a1f6315b8940537e8e98882c6038fbac9ba5 +refs/heads/master: 9b3a6549b2602ca30f58715a0071e29f9898cae9 diff --git a/trunk/drivers/scsi/ses.c b/trunk/drivers/scsi/ses.c index 1d7a8780e00c..0d9d6f7567f5 100644 --- a/trunk/drivers/scsi/ses.c +++ b/trunk/drivers/scsi/ses.c @@ -595,8 +595,6 @@ static int ses_intf_add(struct device *cdev, ses_dev->page10_len = len; buf = NULL; } - kfree(hdr_buf); - scomp = kzalloc(sizeof(struct ses_component) * components, GFP_KERNEL); if (!scomp) goto err_free; @@ -608,6 +606,8 @@ static int ses_intf_add(struct device *cdev, goto err_free; } + kfree(hdr_buf); + edev->scratch = ses_dev; for (i = 0; i < components; i++) edev->component[i].scratch = scomp + i;