diff options
| author | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-08-26 21:52:49 +0000 |
|---|---|---|
| committer | Marcus Glocker <mglocker@cvs.openbsd.org> | 2008-08-26 21:52:49 +0000 |
| commit | 8242a8a3527d7c8d1f9eaf84585fd2bb9d79a681 (patch) | |
| tree | 7276e9b5427fdfbba043c07dbe73af10e0cb1a4b /sys/dev | |
| parent | e56118e28aad1eb81e94228213cc073711827850 (diff) | |
Fix alignment panic on sparc64 by removing a wrong __packed. While
there reorder fields in the struct to make it shorter on 64 bit archs.
panic reported by jasper@
thanks to miod@ for helping me debug this down
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/usb/uvideo.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/dev/usb/uvideo.h b/sys/dev/usb/uvideo.h index f8c226183a1..cbef8613f55 100644 --- a/sys/dev/usb/uvideo.h +++ b/sys/dev/usb/uvideo.h @@ -1,4 +1,4 @@ -/* $OpenBSD: uvideo.h,v 1.29 2008/08/24 11:43:00 mglocker Exp $ */ +/* $OpenBSD: uvideo.h,v 1.30 2008/08/26 21:52:48 mglocker Exp $ */ /* * Copyright (c) 2007 Robert Nagy <robert@openbsd.org> @@ -452,14 +452,14 @@ struct uvideo_format_desc { struct uvideo_format_group { uint32_t pixelformat; - struct uvideo_format_desc *format; uint8_t format_dfidx; + struct uvideo_format_desc *format; /* frame descriptors for mjpeg and uncompressed are identical */ #define UVIDEO_MAX_FRAME 16 - int frame_num; struct usb_video_frame_mjpeg_desc *frame_cur; struct usb_video_frame_mjpeg_desc *frame[UVIDEO_MAX_FRAME]; -} __packed; + int frame_num; +}; struct uvideo_res { int width; |