Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/dvrabel/uwb

+1 -1

drivers/uwb/hwa-rc.c

··· 891 891 } 892 892 893 893 /** USB device ID's that we handle */ 894 - static struct usb_device_id hwarc_id_table[] = { 894 + static const struct usb_device_id hwarc_id_table[] = { 895 895 /* D-Link DUB-1210 */ 896 896 { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3d02, 0xe0, 0x01, 0x02), 897 897 .driver_info = WUSB_QUIRK_WHCI_CMD_EVT },

+7 -5

drivers/uwb/i1480/dfu/usb.c

··· 120 120 result = usb_control_msg( 121 121 i1480_usb->usb_dev, usb_sndctrlpipe(i1480_usb->usb_dev, 0), 122 122 0xf0, USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 123 - cpu_to_le16(memory_address & 0xffff), 124 - cpu_to_le16((memory_address >> 16) & 0xffff), 123 + memory_address, (memory_address >> 16), 125 124 i1480->cmd_buf, buffer_size, 100 /* FIXME: arbitrary */); 126 125 if (result < 0) 127 126 break; ··· 165 166 result = usb_control_msg( 166 167 i1480_usb->usb_dev, usb_rcvctrlpipe(i1480_usb->usb_dev, 0), 167 168 0xf0, USB_DIR_IN | USB_TYPE_VENDOR | USB_RECIP_DEVICE, 168 - cpu_to_le16(itr_addr & 0xffff), 169 - cpu_to_le16((itr_addr >> 16) & 0xffff), 169 + itr_addr, (itr_addr >> 16), 170 170 i1480->cmd_buf + itr, itr_size, 171 171 100 /* FIXME: arbitrary */); 172 172 if (result < 0) { ··· 411 413 return result; 412 414 } 413 415 416 + MODULE_FIRMWARE("i1480-pre-phy-0.0.bin"); 417 + MODULE_FIRMWARE("i1480-usb-0.0.bin"); 418 + MODULE_FIRMWARE("i1480-phy-0.0.bin"); 419 + 414 420 #define i1480_USB_DEV(v, p) \ 415 421 { \ 416 422 .match_flags = USB_DEVICE_ID_MATCH_DEVICE \ ··· 432 430 433 431 434 432 /** USB device ID's that we handle */ 435 - static struct usb_device_id i1480_usb_id_table[] = { 433 + static const struct usb_device_id i1480_usb_id_table[] = { 436 434 i1480_USB_DEV(0x8086, 0xdf3b), 437 435 i1480_USB_DEV(0x15a9, 0x0005), 438 436 i1480_USB_DEV(0x07d1, 0x3802),

+61 -45

drivers/uwb/wlp/messages.c

··· 259 259 } 260 260 261 261 262 + static ssize_t wlp_get_attribute(struct wlp *wlp, u16 type_code, 263 + struct wlp_attr_hdr *attr_hdr, void *value, ssize_t value_len, 264 + ssize_t buflen) 265 + { 266 + struct device *dev = &wlp->rc->uwb_dev.dev; 267 + ssize_t attr_len = sizeof(*attr_hdr) + value_len; 268 + if (buflen < 0) 269 + return -EINVAL; 270 + if (buflen < attr_len) { 271 + dev_err(dev, "WLP: Not enough space in buffer to parse" 272 + " attribute field. Need %d, received %zu\n", 273 + (int)attr_len, buflen); 274 + return -EIO; 275 + } 276 + if (wlp_check_attr_hdr(wlp, attr_hdr, type_code, value_len) < 0) { 277 + dev_err(dev, "WLP: Header verification failed. \n"); 278 + return -EINVAL; 279 + } 280 + memcpy(value, (void *)attr_hdr + sizeof(*attr_hdr), value_len); 281 + return attr_len; 282 + } 283 + 284 + static ssize_t wlp_vget_attribute(struct wlp *wlp, u16 type_code, 285 + struct wlp_attr_hdr *attr_hdr, void *value, ssize_t max_value_len, 286 + ssize_t buflen) 287 + { 288 + struct device *dev = &wlp->rc->uwb_dev.dev; 289 + size_t len; 290 + if (buflen < 0) 291 + return -EINVAL; 292 + if (buflen < sizeof(*attr_hdr)) { 293 + dev_err(dev, "WLP: Not enough space in buffer to parse" 294 + " header.\n"); 295 + return -EIO; 296 + } 297 + if (le16_to_cpu(attr_hdr->type) != type_code) { 298 + dev_err(dev, "WLP: Unexpected attribute type. Got %u, " 299 + "expected %u.\n", le16_to_cpu(attr_hdr->type), 300 + type_code); 301 + return -EINVAL; 302 + } 303 + len = le16_to_cpu(attr_hdr->length); 304 + if (len > max_value_len) { 305 + dev_err(dev, "WLP: Attribute larger than maximum " 306 + "allowed. Received %zu, max is %d.\n", len, 307 + (int)max_value_len); 308 + return -EFBIG; 309 + } 310 + if (buflen < sizeof(*attr_hdr) + len) { 311 + dev_err(dev, "WLP: Not enough space in buffer to parse " 312 + "variable data.\n"); 313 + return -EIO; 314 + } 315 + memcpy(value, (void *)attr_hdr + sizeof(*attr_hdr), len); 316 + return sizeof(*attr_hdr) + len; 317 + } 318 + 262 319 /** 263 320 * Get value of attribute from fixed size attribute field. 264 321 * ··· 331 274 ssize_t wlp_get_##name(struct wlp *wlp, struct wlp_attr_##name *attr, \ 332 275 type *value, ssize_t buflen) \ 333 276 { \ 334 - struct device *dev = &wlp->rc->uwb_dev.dev; \ 335 - if (buflen < 0) \ 336 - return -EINVAL; \ 337 - if (buflen < sizeof(*attr)) { \ 338 - dev_err(dev, "WLP: Not enough space in buffer to parse" \ 339 - " attribute field. Need %d, received %zu\n", \ 340 - (int)sizeof(*attr), buflen); \ 341 - return -EIO; \ 342 - } \ 343 - if (wlp_check_attr_hdr(wlp, &attr->hdr, type_code, \ 344 - sizeof(attr->name)) < 0) { \ 345 - dev_err(dev, "WLP: Header verification failed. \n"); \ 346 - return -EINVAL; \ 347 - } \ 348 - *value = attr->name; \ 349 - return sizeof(*attr); \ 277 + return wlp_get_attribute(wlp, (type_code), &attr->hdr, \ 278 + value, sizeof(*value), buflen); \ 350 279 } 351 280 352 281 #define wlp_get_sparse(type, type_code, name) \ ··· 356 313 struct wlp_attr_##name *attr, \ 357 314 type_val *value, ssize_t buflen) \ 358 315 { \ 359 - struct device *dev = &wlp->rc->uwb_dev.dev; \ 360 - size_t len; \ 361 - if (buflen < 0) \ 362 - return -EINVAL; \ 363 - if (buflen < sizeof(*attr)) { \ 364 - dev_err(dev, "WLP: Not enough space in buffer to parse" \ 365 - " header.\n"); \ 366 - return -EIO; \ 367 - } \ 368 - if (le16_to_cpu(attr->hdr.type) != type_code) { \ 369 - dev_err(dev, "WLP: Unexpected attribute type. Got %u, " \ 370 - "expected %u.\n", le16_to_cpu(attr->hdr.type), \ 371 - type_code); \ 372 - return -EINVAL; \ 373 - } \ 374 - len = le16_to_cpu(attr->hdr.length); \ 375 - if (len > max) { \ 376 - dev_err(dev, "WLP: Attribute larger than maximum " \ 377 - "allowed. Received %zu, max is %d.\n", len, \ 378 - (int)max); \ 379 - return -EFBIG; \ 380 - } \ 381 - if (buflen < sizeof(*attr) + len) { \ 382 - dev_err(dev, "WLP: Not enough space in buffer to parse "\ 383 - "variable data.\n"); \ 384 - return -EIO; \ 385 - } \ 386 - memcpy(value, (void *) attr + sizeof(*attr), len); \ 387 - return sizeof(*attr) + len; \ 316 + return wlp_vget_attribute(wlp, (type_code), &attr->hdr, \ 317 + value, (max), buflen); \ 388 318 } 389 319 390 320 wlp_get(u8, WLP_ATTR_WLP_VER, version)

Configure Feed

Configure Feed