Merge tag 'media/v4.4-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...

[firefly-linux-kernel-4.4.55.git] / drivers / staging / media / omap4iss / iss.c

diff --git a/drivers/staging/media/omap4iss/iss.c b/drivers/staging/media/omap4iss/iss.c
index 104fc582b7369a40c64456f549dc0553794309ef..aa76ccda5b424f73f64776a010afcb9040ecd39f 100644 (file)
--- a/drivers/staging/media/omap4iss/iss.c
+++ b/drivers/staging/media/omap4iss/iss.c
@@ -469,8 +469,8 @@ static int iss_pipeline_pm_power(struct media_entity *entity, int change)
 
        media_entity_graph_walk_start(&graph, first);
 
-       while ((first = media_entity_graph_walk_next(&graph))
-              && first != entity)
+       while ((first = media_entity_graph_walk_next(&graph)) &&
+              first != entity)
                if (media_entity_type(first) != MEDIA_ENT_T_DEVNODE)
                        iss_pipeline_pm_power_one(first, -change);
 
@@ -541,7 +541,7 @@ static int iss_pipeline_link_notify(struct media_link *link, u32 flags,
        }
 
        if (notification == MEDIA_DEV_NOTIFY_POST_LINK_CH &&
-               (flags & MEDIA_LNK_FL_ENABLED)) {
+           (flags & MEDIA_LNK_FL_ENABLED)) {
                ret = iss_pipeline_pm_power(source, sink_use);
                if (ret < 0)
                        return ret;
@@ -919,7 +919,7 @@ static int __iss_subclk_update(struct iss_device *iss)
 }
 
 int omap4iss_subclk_enable(struct iss_device *iss,
-                           enum iss_subclk_resource res)
+                          enum iss_subclk_resource res)
 {
        iss->subclk_resources |= res;
 
@@ -927,7 +927,7 @@ int omap4iss_subclk_enable(struct iss_device *iss,
 }
 
 int omap4iss_subclk_disable(struct iss_device *iss,
-                            enum iss_subclk_resource res)
+                           enum iss_subclk_resource res)
 {
        iss->subclk_resources &= ~res;
 
@@ -1137,7 +1137,7 @@ static void iss_unregister_entities(struct iss_device *iss)
  */
 static struct v4l2_subdev *
 iss_register_subdev_group(struct iss_device *iss,
-                    struct iss_subdev_i2c_board_info *board_info)
+                         struct iss_subdev_i2c_board_info *board_info)
 {
        struct v4l2_subdev *sensor = NULL;
        unsigned int first;
@@ -1440,12 +1440,13 @@ static int iss_probe(struct platform_device *pdev)
                 iss_reg_read(iss, OMAP4_ISS_MEM_ISP_SYS1, ISP5_REVISION));
 
        /* Interrupt */
-       iss->irq_num = platform_get_irq(pdev, 0);
-       if (iss->irq_num <= 0) {
+       ret = platform_get_irq(pdev, 0);
+       if (ret <= 0) {
                dev_err(iss->dev, "No IRQ resource\n");
                ret = -ENODEV;
                goto error_iss;
        }
+       iss->irq_num = ret;
 
        if (devm_request_irq(iss->dev, iss->irq_num, iss_isr, IRQF_SHARED,
                             "OMAP4 ISS", iss)) {