tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge tag 'staging-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging

Pull staging driver fixes from Greg KH:
"Here are three small staging driver fixes for 6.15-rc6. These are:

- bcm2835-camera driver fix

- two axis-fifo driver fixes

All of these have been in linux-next for a few weeks with no reported
issues"

* tag 'staging-6.15-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging:
staging: axis-fifo: Remove hardware resets for user errors
staging: axis-fifo: Correct handling of tx_fifo_depth for size validation
staging: bcm2835-camera: Initialise dev in v4l2_dev

Linus Torvalds 067dd587 914a1fe5

+4 -11
+3 -11
drivers/staging/axis-fifo/axis-fifo.c
··· 393 393 394 394 bytes_available = ioread32(fifo->base_addr + XLLF_RLR_OFFSET); 395 395 if (!bytes_available) { 396 - dev_err(fifo->dt_device, "received a packet of length 0 - fifo core will be reset\n"); 397 - reset_ip_core(fifo); 396 + dev_err(fifo->dt_device, "received a packet of length 0\n"); 398 397 ret = -EIO; 399 398 goto end_unlock; 400 399 } 401 400 402 401 if (bytes_available > len) { 403 - dev_err(fifo->dt_device, "user read buffer too small (available bytes=%zu user buffer bytes=%zu) - fifo core will be reset\n", 402 + dev_err(fifo->dt_device, "user read buffer too small (available bytes=%zu user buffer bytes=%zu)\n", 404 403 bytes_available, len); 405 - reset_ip_core(fifo); 406 404 ret = -EINVAL; 407 405 goto end_unlock; 408 406 } ··· 409 411 /* this probably can't happen unless IP 410 412 * registers were previously mishandled 411 413 */ 412 - dev_err(fifo->dt_device, "received a packet that isn't word-aligned - fifo core will be reset\n"); 413 - reset_ip_core(fifo); 414 + dev_err(fifo->dt_device, "received a packet that isn't word-aligned\n"); 414 415 ret = -EIO; 415 416 goto end_unlock; 416 417 } ··· 430 433 431 434 if (copy_to_user(buf + copied * sizeof(u32), tmp_buf, 432 435 copy * sizeof(u32))) { 433 - reset_ip_core(fifo); 434 436 ret = -EFAULT; 435 437 goto end_unlock; 436 438 } ··· 538 542 539 543 if (copy_from_user(tmp_buf, buf + copied * sizeof(u32), 540 544 copy * sizeof(u32))) { 541 - reset_ip_core(fifo); 542 545 ret = -EFAULT; 543 546 goto end_unlock; 544 547 } ··· 769 774 ret = -EIO; 770 775 goto end; 771 776 } 772 - 773 - /* IP sets TDFV to fifo depth - 4 so we will do the same */ 774 - fifo->tx_fifo_depth -= 4; 775 777 776 778 ret = get_dts_property(fifo, "xlnx,use-rx-data", &fifo->has_rx_fifo); 777 779 if (ret) {
+1
drivers/staging/vc04_services/bcm2835-camera/bcm2835-camera.c
··· 1900 1900 __func__, ret); 1901 1901 goto free_dev; 1902 1902 } 1903 + dev->v4l2_dev.dev = &device->dev; 1903 1904 1904 1905 /* setup v4l controls */ 1905 1906 ret = bcm2835_mmal_init_controls(dev, &dev->ctrl_handler);