aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShobhit Kumar <shobhit.kumar@intel.com>2014-04-15 04:24:07 -0400
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-04-15 15:46:09 -0400
commitb0256cdcb4c3aa1fe141d30cbf232872282cbb64 (patch)
treeae7437767460932221c57d45327d2b1aa40e1a61
parent4d43e9bd1f38a4e42cea4c8527df191a9299122b (diff)
drm/i915: Code cleanup patch to fix checkpatch errors
This cleans up the checkpatch errors for the merged commit - commit d3b542fcfc72d7724585e3fd2c5e75351bc3df47 Author: Shobhit Kumar <shobhit.kumar@intel.com> Date: Mon Apr 14 11:00:34 2014 +0530 drm/i915: Add parsing support for new MIPI blocks in VBT Signed-off-by: Shobhit Kumar <shobhit.kumar@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_bios.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/intel_bios.c b/drivers/gpu/drm/i915/intel_bios.c
index f491e363e84d..054dbe7fdf9b 100644
--- a/drivers/gpu/drm/i915/intel_bios.c
+++ b/drivers/gpu/drm/i915/intel_bios.c
@@ -643,13 +643,15 @@ static u8 *goto_next_sequence(u8 *data, int *size)
643 * skip by this element payload size 643 * skip by this element payload size
644 * skip elem id, command flag and data type 644 * skip elem id, command flag and data type
645 */ 645 */
646 if ((tmp = tmp - 5) < 0) 646 tmp -= 5;
647 if (tmp < 0)
647 return NULL; 648 return NULL;
648 649
649 data += 3; 650 data += 3;
650 len = *((u16 *)data); 651 len = *((u16 *)data);
651 652
652 if ((tmp = tmp - len) < 0) 653 tmp -= len;
654 if (tmp < 0)
653 return NULL; 655 return NULL;
654 656
655 /* skip by len */ 657 /* skip by len */
@@ -657,13 +659,15 @@ static u8 *goto_next_sequence(u8 *data, int *size)
657 break; 659 break;
658 case MIPI_SEQ_ELEM_DELAY: 660 case MIPI_SEQ_ELEM_DELAY:
659 /* skip by elem id, and delay is 4 bytes */ 661 /* skip by elem id, and delay is 4 bytes */
660 if ((tmp = tmp - 5) < 0) 662 tmp -= 5;
663 if (tmp < 0)
661 return NULL; 664 return NULL;
662 665
663 data += 5; 666 data += 5;
664 break; 667 break;
665 case MIPI_SEQ_ELEM_GPIO: 668 case MIPI_SEQ_ELEM_GPIO:
666 if ((tmp = tmp - 3) < 0) 669 tmp -= 3;
670 if (tmp < 0)
667 return NULL; 671 return NULL;
668 672
669 data += 3; 673 data += 3;