diff --git a/[refs] b/[refs] index 554dc701dbce..d16772666de2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7b88fc086a217be7d16ec68a7f66093d344e39d7 +refs/heads/master: e35abd4472c4ef235a8c3873d4b37a6b5fb1cb90 diff --git a/trunk/drivers/media/platform/soc_camera/atmel-isi.c b/trunk/drivers/media/platform/soc_camera/atmel-isi.c index e7ccc5e7bf39..1abbb36d0755 100644 --- a/trunk/drivers/media/platform/soc_camera/atmel-isi.c +++ b/trunk/drivers/media/platform/soc_camera/atmel-isi.c @@ -1021,7 +1021,7 @@ static int atmel_isi_probe(struct platform_device *pdev) isi_writel(isi, ISI_CTRL, ISI_CTRL_DIS); irq = platform_get_irq(pdev, 0); - if (irq < 0) { + if (IS_ERR_VALUE(irq)) { ret = irq; goto err_req_irq; }