Skip to content

media: bcm2835-unicam: Always service interrupts #3608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 13, 2020
Merged

media: bcm2835-unicam: Always service interrupts #3608

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 0 additions & 15 deletions drivers/media/platform/bcm2835/bcm2835-unicam.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,12 +766,6 @@ static int unicam_all_nodes_streaming(struct unicam_device *dev)
return ret;
}

static int unicam_all_nodes_disabled(struct unicam_device *dev)
{
return !dev->node[IMAGE_PAD].streaming &&
!dev->node[METADATA_PAD].streaming;
}

static void unicam_queue_event_sof(struct unicam_device *unicam)
{
struct v4l2_event event = {
Expand Down Expand Up @@ -801,15 +795,6 @@ static irqreturn_t unicam_isr(int irq, void *dev)
u64 ts;
int i;

/*
* Don't service interrupts if not streaming.
* Avoids issues if the VPU should enable the
* peripheral without the kernel knowing (that
* shouldn't happen, but causes issues if it does).
*/
if (unicam_all_nodes_disabled(unicam))
return IRQ_HANDLED;

sta = reg_read(cfg, UNICAM_STA);
/* Write value back to clear the interrupts */
reg_write(cfg, UNICAM_STA, sta);
Expand Down