1 files changed, 4 insertions, 3 deletions

diff --git a/drivers/scsi/device_handler/scsi_dh_hp_sw.c b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
index e3916641e62..b479f1eef96 100644
--- a/drivers/scsi/device_handler/scsi_dh_hp_sw.c
+++ b/drivers/scsi/device_handler/scsi_dh_hp_sw.c
@@ -225,7 +225,8 @@ static void start_stop_endio(struct request *req, int error)
                 }
         }
 done:
-        blk_put_request(req);
+        req->end_io_data = NULL;
+        __blk_put_request(req->q, req);
         if (h->callback_fn) {
                 h->callback_fn(h->callback_data, err);
                 h->callback_fn = h->callback_data = NULL;
@@ -338,8 +339,8 @@ static int hp_sw_bus_attach(struct scsi_device *sdev)
         unsigned long flags;
         int ret;
 
-        scsi_dh_data = kzalloc(sizeof(struct scsi_device_handler *)
-                               + sizeof(struct hp_sw_dh_data) , GFP_KERNEL);
+        scsi_dh_data = kzalloc(sizeof(*scsi_dh_data)
+                               + sizeof(*h) , GFP_KERNEL);
         if (!scsi_dh_data) {
                 sdev_printk(KERN_ERR, sdev, "%s: Attach Failed\n",
                             HP_SW_NAME);