@@ -1919,7 +1918,6 @@ static struct urb *dlfb_get_urb(struct dlfb_data *dlfb)
int ret;
struct list_head *entry;
struct urb_node *unode;
- struct urb *urb = NULL;
unsigned long flags;
/* Wait for an in-flight buffer to complete and get re-queued */
@@ -1928,7 +1926,7 @@ static struct urb *dlfb_get_urb(struct dlfb_data *dlfb)
atomic_set(&dlfb->lost_pixels, 1);
pr_warn("wait for urb interrupted: %x available: %d\n",
ret, dlfb->urbs.available);
- goto error;
+ return NULL;
}
spin_lock_irqsave(&dlfb->urbs.lock, flags);
@@ -1941,10 +1939,7 @@ static struct urb *dlfb_get_urb(struct dlfb_data *dlfb)
spin_unlock_irqrestore(&dlfb->urbs.lock, flags);
unode = list_entry(entry, struct urb_node, entry);
- urb = unode->urb;
-
-error:
- return urb;
+ return unode->urb;
}
static int dlfb_submit_urb(struct dlfb_data *dlfb, struct urb *urb, size_t len)
'urb' is not needed and can be removed. Signed-off-by: Ladislav Michl <ladis@linux-mips.org> --- drivers/video/fbdev/udlfb.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-)