2 files changed, 6 insertions, 22 deletions

diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 5f77417ed585..3ee4eb40abcf 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -533,12 +533,8 @@ fc_host_post_event(struct Scsi_Host *shost, u32 event_number,
         event->event_code = event_code;
         event->event_data = event_data;
 
-        err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
-                              GFP_KERNEL);
-        if (err && (err != -ESRCH))     /* filter no recipient errors */
-                /* nlmsg_multicast already kfree_skb'd */
-                goto send_fail;
-
+        nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
+                        GFP_KERNEL);
         return;
 
 send_fail_skb:
@@ -607,12 +603,8 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number,
         event->event_code = FCH_EVT_VENDOR_UNIQUE;
         memcpy(&event->event_data, data_buf, data_len);
 
-        err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
-                              GFP_KERNEL);
-        if (err && (err != -ESRCH))     /* filter no recipient errors */
-                /* nlmsg_multicast already kfree_skb'd */
-                goto send_vendor_fail;
-
+        nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS,
+                        GFP_KERNEL);
         return;
 
 send_vendor_fail_skb:
diff --git a/drivers/scsi/scsi_transport_iscsi.c b/drivers/scsi/scsi_transport_iscsi.c
index 75c9297694cb..2adfab8c11c1 100644
--- a/drivers/scsi/scsi_transport_iscsi.c
+++ b/drivers/scsi/scsi_transport_iscsi.c
@@ -966,15 +966,7 @@ iscsi_if_transport_lookup(struct iscsi_transport *tt)
 static int
 iscsi_broadcast_skb(struct sk_buff *skb, gfp_t gfp)
 {
-        int rc;
-
-        rc = netlink_broadcast(nls, skb, 0, 1, gfp);
-        if (rc < 0) {
-                printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc);
-                return rc;
-        }
-
-        return 0;
+        return netlink_broadcast(nls, skb, 0, 1, gfp);
 }
 
 static int
@@ -1207,7 +1199,7 @@ int iscsi_session_event(struct iscsi_cls_session *session,
          * the user and when the daemon is restarted it will handle it
          */
         rc = iscsi_broadcast_skb(skb, GFP_KERNEL);
-        if (rc < 0)
+        if (rc == -ESRCH)
                 iscsi_cls_session_printk(KERN_ERR, session,
                                          "Cannot notify userspace of session "
                                          "event %u. Check iscsi daemon\n",