Merge tag 'pinctrl-v3.20-1' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...

[karo-tx-linux.git] / drivers / scsi / pmcraid.c

diff --git a/drivers/scsi/pmcraid.c b/drivers/scsi/pmcraid.c
index 8c27b6a77ec4b1ae9c914cfe15eb05d7dd0b371a..ed31d8cc62665cf919d6b31d3bad01c275104362 100644 (file)
--- a/drivers/scsi/pmcraid.c
+++ b/drivers/scsi/pmcraid.c
@@ -1473,13 +1473,7 @@ static int pmcraid_notify_aen(
        }
 
        /* send genetlink multicast message to notify appplications */
-       result = genlmsg_end(skb, msg_header);
-
-       if (result < 0) {
-               pmcraid_err("genlmsg_end failed\n");
-               nlmsg_free(skb);
-               return result;
-       }
+       genlmsg_end(skb, msg_header);
 
        result = genlmsg_multicast(&pmcraid_event_family, skb,
                                   0, 0, GFP_ATOMIC);
@@ -4223,7 +4217,7 @@ static ssize_t pmcraid_show_adapter_id(
 static struct device_attribute pmcraid_adapter_id_attr = {
        .attr = {
                 .name = "adapter_id",
-                .mode = S_IRUGO | S_IWUSR,
+                .mode = S_IRUGO,
                 },
        .show = pmcraid_show_adapter_id,
 };