diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/acpi/event.c | 6 | ||||
-rw-r--r-- | drivers/scsi/scsi_transport_fc.c | 16 | ||||
-rw-r--r-- | drivers/scsi/scsi_transport_iscsi.c | 12 | ||||
-rw-r--r-- | drivers/video/uvesafb.c | 5 |
4 files changed, 11 insertions, 28 deletions
diff --git a/drivers/acpi/event.c b/drivers/acpi/event.c index 0c24bd4d6562..aeb7e5fb4a04 100644 --- a/drivers/acpi/event.c +++ b/drivers/acpi/event.c | |||
@@ -235,11 +235,7 @@ int acpi_bus_generate_netlink_event(const char *device_class, | |||
235 | return result; | 235 | return result; |
236 | } | 236 | } |
237 | 237 | ||
238 | result = | 238 | genlmsg_multicast(skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC); |
239 | genlmsg_multicast(skb, 0, acpi_event_mcgrp.id, GFP_ATOMIC); | ||
240 | if (result) | ||
241 | ACPI_DEBUG_PRINT((ACPI_DB_INFO, | ||
242 | "Failed to send a Genetlink message!\n")); | ||
243 | return 0; | 239 | return 0; |
244 | } | 240 | } |
245 | 241 | ||
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, | |||
533 | event->event_code = event_code; | 533 | event->event_code = event_code; |
534 | event->event_data = event_data; | 534 | event->event_data = event_data; |
535 | 535 | ||
536 | err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, | 536 | nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, |
537 | GFP_KERNEL); | 537 | GFP_KERNEL); |
538 | if (err && (err != -ESRCH)) /* filter no recipient errors */ | ||
539 | /* nlmsg_multicast already kfree_skb'd */ | ||
540 | goto send_fail; | ||
541 | |||
542 | return; | 538 | return; |
543 | 539 | ||
544 | send_fail_skb: | 540 | send_fail_skb: |
@@ -607,12 +603,8 @@ fc_host_post_vendor_event(struct Scsi_Host *shost, u32 event_number, | |||
607 | event->event_code = FCH_EVT_VENDOR_UNIQUE; | 603 | event->event_code = FCH_EVT_VENDOR_UNIQUE; |
608 | memcpy(&event->event_data, data_buf, data_len); | 604 | memcpy(&event->event_data, data_buf, data_len); |
609 | 605 | ||
610 | err = nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, | 606 | nlmsg_multicast(scsi_nl_sock, skb, 0, SCSI_NL_GRP_FC_EVENTS, |
611 | GFP_KERNEL); | 607 | GFP_KERNEL); |
612 | if (err && (err != -ESRCH)) /* filter no recipient errors */ | ||
613 | /* nlmsg_multicast already kfree_skb'd */ | ||
614 | goto send_vendor_fail; | ||
615 | |||
616 | return; | 608 | return; |
617 | 609 | ||
618 | send_vendor_fail_skb: | 610 | 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) | |||
966 | static int | 966 | static int |
967 | iscsi_broadcast_skb(struct sk_buff *skb, gfp_t gfp) | 967 | iscsi_broadcast_skb(struct sk_buff *skb, gfp_t gfp) |
968 | { | 968 | { |
969 | int rc; | 969 | return netlink_broadcast(nls, skb, 0, 1, gfp); |
970 | |||
971 | rc = netlink_broadcast(nls, skb, 0, 1, gfp); | ||
972 | if (rc < 0) { | ||
973 | printk(KERN_ERR "iscsi: can not broadcast skb (%d)\n", rc); | ||
974 | return rc; | ||
975 | } | ||
976 | |||
977 | return 0; | ||
978 | } | 970 | } |
979 | 971 | ||
980 | static int | 972 | static int |
@@ -1207,7 +1199,7 @@ int iscsi_session_event(struct iscsi_cls_session *session, | |||
1207 | * the user and when the daemon is restarted it will handle it | 1199 | * the user and when the daemon is restarted it will handle it |
1208 | */ | 1200 | */ |
1209 | rc = iscsi_broadcast_skb(skb, GFP_KERNEL); | 1201 | rc = iscsi_broadcast_skb(skb, GFP_KERNEL); |
1210 | if (rc < 0) | 1202 | if (rc == -ESRCH) |
1211 | iscsi_cls_session_printk(KERN_ERR, session, | 1203 | iscsi_cls_session_printk(KERN_ERR, session, |
1212 | "Cannot notify userspace of session " | 1204 | "Cannot notify userspace of session " |
1213 | "event %u. Check iscsi daemon\n", | 1205 | "event %u. Check iscsi daemon\n", |
diff --git a/drivers/video/uvesafb.c b/drivers/video/uvesafb.c index 6c2d37fdd3b9..74ae75899009 100644 --- a/drivers/video/uvesafb.c +++ b/drivers/video/uvesafb.c | |||
@@ -204,8 +204,11 @@ static int uvesafb_exec(struct uvesafb_ktask *task) | |||
204 | } else { | 204 | } else { |
205 | v86d_started = 1; | 205 | v86d_started = 1; |
206 | err = cn_netlink_send(m, 0, gfp_any()); | 206 | err = cn_netlink_send(m, 0, gfp_any()); |
207 | if (err == -ENOBUFS) | ||
208 | err = 0; | ||
207 | } | 209 | } |
208 | } | 210 | } else if (err == -ENOBUFS) |
211 | err = 0; | ||
209 | 212 | ||
210 | if (!err && !(task->t.flags & TF_EXIT)) | 213 | if (!err && !(task->t.flags & TF_EXIT)) |
211 | err = !wait_for_completion_timeout(task->done, | 214 | err = !wait_for_completion_timeout(task->done, |