Commit 7e6cbb6a authored by Randy Dunlap's avatar Randy Dunlap Committed by Greg Kroah-Hartman

[PATCH] build cpia video driver

This patch enables the cpia driver to build on 2.5.41.
parent b885ce2a
...@@ -378,8 +378,8 @@ void cpia_unregister_camera(struct cam_data *cam); ...@@ -378,8 +378,8 @@ void cpia_unregister_camera(struct cam_data *cam);
/* ErrorCode */ /* ErrorCode */
#define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */ #define ERROR_FLICKER_BELOW_MIN_EXP 0x01 /*flicker exposure got below minimum exposure */
#define ALOG(lineno,fmt,args...) printk(fmt,lineno,##args) #define ALOG(fmt,args...) printk(fmt, ##args)
#define LOG(fmt,args...) ALOG((__LINE__),KERN_INFO __FILE__":"__FUNCTION__"(%d):"fmt,##args) #define LOG(fmt,args...) ALOG(KERN_INFO __FILE__ ":%s(%d):" fmt, __FUNCTION__, __LINE__, ##args)
#ifdef _CPIA_DEBUG_ #ifdef _CPIA_DEBUG_
#define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args) #define ADBG(lineno,fmt,args...) printk(fmt, jiffies, lineno, ##args)
......
...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb) ...@@ -167,7 +167,7 @@ static void cpia_usb_complete(struct urb *urb)
/* resubmit */ /* resubmit */
urb->dev = ucpia->dev; urb->dev = ucpia->dev;
if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0) if ((i = usb_submit_urb(urb, GFP_ATOMIC)) != 0)
printk(KERN_ERR __FUNCTION__ ": usb_submit_urb ret %d\n", i); printk(KERN_ERR "%s: usb_submit_urb ret %d\n", __FUNCTION__, i);
} }
static int cpia_usb_open(void *privdata) static int cpia_usb_open(void *privdata)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment