From 665c4d61786c1edfbeb3857141daf48bb5365717 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Tue, 27 Apr 2010 16:45:27 -0700
Subject: [PATCH] --- yaml --- r: 196991 b: refs/heads/master c:
 7f76c52fb0f4c7dfbe7dba1e80691fef957242b6 h: refs/heads/master i:   196989:
 49a24a3358c699654850b3795c5974d3e558d9c9   196987:
 bf69b143e92373229a2b01cd9eb70593373b7967   196983:
 90a6218f035f68b5e01084caf58df6c075c9fee6   196975:
 c31bb49fbfb8cc5769f3386f45d597eb6efcb3ee   196959:
 583721e02cfbb59ca6786d27998b9a61f8963b0b   196927:
 167d7f59d522e4d74556b768ee6fe6e84d525d02   196863:
 85dcddb21b48e32c91a2c401620a6d967a843d9c v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/staging/dt3155/dt3155.h     | 8 ++++----
 trunk/drivers/staging/dt3155/dt3155_drv.c | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 74beca2d856b..d8771161b41d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ffefea471134987fc647f0a7502540bb6e5ae71f
+refs/heads/master: 7f76c52fb0f4c7dfbe7dba1e80691fef957242b6
diff --git a/trunk/drivers/staging/dt3155/dt3155.h b/trunk/drivers/staging/dt3155/dt3155.h
index 453686e8064c..93ee663f033f 100644
--- a/trunk/drivers/staging/dt3155/dt3155.h
+++ b/trunk/drivers/staging/dt3155/dt3155.h
@@ -68,11 +68,11 @@ struct dt3155_config_s {
 
 
 /* hold data for each frame */
-typedef struct {
+struct frame_info {
 	u32 addr;		/* address of the buffer with the frame */
 	u32 tag;		/* unique number for the frame */
 	struct timeval time;	/* time that capture took place */
-} frame_info_t;
+};
 
 /*
  * Structure for interrupt and buffer handling.
@@ -81,7 +81,7 @@ typedef struct {
 struct dt3155_fbuffer_s {
 	int    nbuffers;
 
-	frame_info_t frame_info[BOARD_MAX_BUFFS];
+	struct frame_info frame_info[BOARD_MAX_BUFFS];
 
 	int empty_buffers[BOARD_MAX_BUFFS];	/* indexes empty frames */
 	int empty_len;				/* Number of empty buffers */
@@ -155,7 +155,7 @@ typedef struct dt3155_read_s {
 	u32 frame_seq;
 	u32 state;
 
-	frame_info_t frame_info;
+	struct frame_info frame_info;
 } dt3155_read_t;
 
 #endif /* _DT3155_inc */
diff --git a/trunk/drivers/staging/dt3155/dt3155_drv.c b/trunk/drivers/staging/dt3155/dt3155_drv.c
index 91ebfadba9a7..cd674e1c6d0f 100644
--- a/trunk/drivers/staging/dt3155/dt3155_drv.c
+++ b/trunk/drivers/staging/dt3155/dt3155_drv.c
@@ -757,7 +757,7 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
   int		minor = MINOR(filep->f_dentry->d_inode->i_rdev);
   u32		offset;
   int		frame_index;
-  frame_info_t	*frame_info_p;
+  struct frame_info	*frame_info;
 
   /* TODO: this should check the error flag and */
   /*   return an error on hardware failures */
@@ -807,10 +807,10 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
 	}
     }
 
-  frame_info_p = &dt3155_status[minor].fbuffer.frame_info[frame_index];
+  frame_info = &dt3155_status[minor].fbuffer.frame_info[frame_index];
 
   /* make this an offset */
-  offset = frame_info_p->addr - dt3155_status[minor].mem_addr;
+  offset = frame_info->addr - dt3155_status[minor].mem_addr;
 
   put_user(offset, (unsigned int *) buf);
   buf += sizeof(u32);
@@ -818,7 +818,7 @@ static ssize_t dt3155_read(struct file *filep, char __user *buf,
   buf += sizeof(u32);
   put_user(dt3155_status[minor].state, (unsigned int *) buf);
   buf += sizeof(u32);
-  if (copy_to_user(buf, frame_info_p, sizeof(frame_info_t)))
+  if (copy_to_user(buf, frame_info, sizeof(*frame_info)))
       return -EFAULT;
 
   return sizeof(dt3155_read_t);