From e00bc88ab30a9d731207c1b4d63c3cb978ad4783 Mon Sep 17 00:00:00 2001 From: Chandra Seetharaman Date: Fri, 11 Sep 2009 10:20:35 -0700 Subject: [PATCH] --- yaml --- r: 173693 b: refs/heads/master c: 5917290ce9b376866b165d02a5ed88d5ecdb32d0 h: refs/heads/master i: 173691: 1b46e3c0d391d5096451af1dba94f83a556895bc v: v3 --- [refs] | 2 +- trunk/drivers/scsi/device_handler/scsi_dh.c | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/[refs] b/[refs] index fd33f30d83a6..98453fb242d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cd7560cb69489c6b798b61897449989b4e972327 +refs/heads/master: 5917290ce9b376866b165d02a5ed88d5ecdb32d0 diff --git a/trunk/drivers/scsi/device_handler/scsi_dh.c b/trunk/drivers/scsi/device_handler/scsi_dh.c index 6f7f798910e8..e19a1a55270c 100644 --- a/trunk/drivers/scsi/device_handler/scsi_dh.c +++ b/trunk/drivers/scsi/device_handler/scsi_dh.c @@ -304,18 +304,15 @@ static int scsi_dh_notifier(struct notifier_block *nb, sdev = to_scsi_device(dev); if (action == BUS_NOTIFY_ADD_DEVICE) { + err = device_create_file(dev, &scsi_dh_state_attr); + /* don't care about err */ devinfo = device_handler_match(NULL, sdev); - if (!devinfo) - goto out; - - err = scsi_dh_handler_attach(sdev, devinfo); - if (!err) - err = device_create_file(dev, &scsi_dh_state_attr); + if (devinfo) + err = scsi_dh_handler_attach(sdev, devinfo); } else if (action == BUS_NOTIFY_DEL_DEVICE) { device_remove_file(dev, &scsi_dh_state_attr); scsi_dh_handler_detach(sdev, NULL); } -out: return err; }