Merge branch 'drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[mv-sheeva.git] / drivers / uwb / hwa-rc.c

diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c
index 559f8784acf36e52a47a3ee277f0d24eb47c7c06..e7eeb63fab23a11632a1b94176def00e28bc9d27 100644 (file)
--- a/drivers/uwb/hwa-rc.c
+++ b/drivers/uwb/hwa-rc.c
@@ -501,7 +501,7 @@ int hwarc_filter_event_WUSB_0100(struct uwb_rc *rc, struct uwb_rceb **header,
        int result = -ENOANO;
        struct uwb_rceb *rceb = *header;
        int event = le16_to_cpu(rceb->wEvent);
-       size_t event_size;
+       ssize_t event_size;
        size_t core_size, offset;
 
        if (rceb->bEventType != UWB_RC_CET_GENERAL)
@@ -887,8 +887,7 @@ static int hwarc_post_reset(struct usb_interface *iface)
        struct hwarc *hwarc = usb_get_intfdata(iface);
        struct uwb_rc *uwb_rc = hwarc->uwb_rc;
 
-       uwb_rc_post_reset(uwb_rc);
-       return 0;
+       return uwb_rc_post_reset(uwb_rc);
 }
 
 /** USB device ID's that we handle */