diff --git a/[refs] b/[refs] index 41dcba02eab4..0118ea33d7de 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 527f18be2d69db4752e5b7f227548a075a37749b +refs/heads/master: aecf33db58cbcb40299a7630b3b6c89aa126fcb6 diff --git a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c index 25c6025eb54f..280c84ec4cc2 100644 --- a/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c +++ b/trunk/drivers/staging/media/dt3155v4l/dt3155v4l.c @@ -908,9 +908,10 @@ dt3155_probe(struct pci_dev *pdev, const struct pci_device_id *id) if (err) goto err_req_region; pd->regs = pci_iomap(pdev, 0, pci_resource_len(pd->pdev, 0)); - if (!pd->regs) + if (!pd->regs) { err = -ENOMEM; goto err_pci_iomap; + } err = dt3155_init_board(pdev); if (err) goto err_init_board;