staging: unisys: visorbus: don't ignore visorchannel_read error
authorDavid Kershner <david.kershner@unisys.com>
Tue, 28 Mar 2017 13:34:51 +0000 (09:34 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 29 Mar 2017 07:17:03 +0000 (09:17 +0200)
Don't override the visorchannel_read_error, just return the
error that it generates.

Signed-off-by: David Kershner <david.kershner@unisys.com>
Reviewed-by: Reviewed-by: Tim Sell <timothy.sell@unisys.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/unisys/visorbus/visorbus_main.c

index f5b637ccf1cd52ff376a3e437861366dc0d95df0..af9bf2453b44d13e7a8f318f347cb8f0b8018504 100644 (file)
@@ -691,6 +691,8 @@ static int
 get_vbus_header_info(struct visorchannel *chan,
                     struct spar_vbus_headerinfo *hdr_info)
 {
+       int err;
+
        if (!spar_check_channel(visorchannel_get_header(chan),
                                spar_vbus_channel_protocol_uuid,
                                "vbus",
@@ -699,10 +701,11 @@ get_vbus_header_info(struct visorchannel *chan,
                                SPAR_VBUS_CHANNEL_PROTOCOL_SIGNATURE))
                return -EINVAL;
 
-       if (visorchannel_read(chan, sizeof(struct channel_header), hdr_info,
-                             sizeof(*hdr_info)) < 0) {
-               return -EIO;
-       }
+       err = visorchannel_read(chan, sizeof(struct channel_header), hdr_info,
+                               sizeof(*hdr_info));
+       if (err < 0)
+               return err;
+
        if (hdr_info->struct_bytes < sizeof(struct spar_vbus_headerinfo))
                return -EINVAL;