diff options
author | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
---|---|---|
committer | Michael Hunold <devnull@localhost> | 2005-01-21 14:45:06 +0000 |
commit | b166ed22268f79cb34ef95ce95631331381717ff (patch) | |
tree | c735880d90aa3bcfa36374817820416b38d8873a /linux/drivers/media/dvb/b2c2 | |
parent | 6d40e62c1ad6249ce66d56629d0c76bcd064e3fd (diff) | |
download | mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.gz mediapointer-dvb-s2-b166ed22268f79cb34ef95ce95631331381717ff.tar.bz2 |
various backport from 2.6.11-rc1:
- replace static spinlock initializations with spin_lock_init()
- add le16_to_cpu() macros to various values aquired via USB
- add __user annotations to user space pointers
Diffstat (limited to 'linux/drivers/media/dvb/b2c2')
-rw-r--r-- | linux/drivers/media/dvb/b2c2/b2c2-usb-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linux/drivers/media/dvb/b2c2/b2c2-usb-core.c b/linux/drivers/media/dvb/b2c2/b2c2-usb-core.c index eedaf7c87..5d3b7f1f3 100644 --- a/linux/drivers/media/dvb/b2c2/b2c2-usb-core.c +++ b/linux/drivers/media/dvb/b2c2/b2c2-usb-core.c @@ -380,7 +380,7 @@ static void b2c2_exit_usb(struct usb_b2c2_usb *b2c2) static int b2c2_init_usb(struct usb_b2c2_usb *b2c2) { - u16 frame_size = b2c2->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize; + u16 frame_size = le16_to_cpu(b2c2->uintf->cur_altsetting->endpoint[0].desc.wMaxPacketSize); int bufsize = B2C2_USB_NUM_ISO_URB * B2C2_USB_FRAMES_PER_ISO * frame_size,i,j,ret; int buffer_offset = 0; |