OSDN Git Service

greybus: sdio: error out only for smaller payloads received
authorViresh Kumar <viresh.kumar@linaro.org>
Sat, 8 Aug 2015 02:39:32 +0000 (08:09 +0530)
committerGreg Kroah-Hartman <gregkh@google.com>
Tue, 11 Aug 2015 00:36:55 +0000 (17:36 -0700)
!= was used in place of <, while comparing expected and actual payload
size. The module may be running a higher version of the protocol and
might have some extra fields (towards the end) in the structure, and the
AP needs to ignore them.

This also updates the print (expected-payload-size <
actual-payload-size), when the size doesn't match for requests received
by the module. This gives more details required for debugging.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
drivers/staging/greybus/sdio.c

index a709bd6..345cfff 100644 (file)
@@ -192,8 +192,9 @@ static int gb_sdio_event_recv(u8 type, struct gb_operation *op)
 
        request = op->request;
 
-       if (request->payload_size != sizeof(*payload)) {
-               dev_err(mmc_dev(host->mmc), "wrong event size received\n");
+       if (request->payload_size < sizeof(*payload)) {
+               dev_err(mmc_dev(host->mmc), "wrong event size received (%zu < %zu)\n",
+                       request->payload_size, sizeof(*payload));
                return -EINVAL;
        }