diff --git a/solo6x10-v4l2-enc.c b/solo6x10-v4l2-enc.c
index de04292..8c2b9a9 100644
--- a/solo6x10-v4l2-enc.c
+++ b/solo6x10-v4l2-enc.c
@@ -581,8 +581,7 @@ static int solo_fill_jpeg(struct solo_enc_fh *fh, struct videobuf_buffer *vb,
 			    solo_enc->jpeg_header,
 			    solo_enc->jpeg_len);
 
-	frame_size = (vh->jpeg_size + solo_enc->jpeg_len + (DMA_ALIGN - 1))
-		& ~(DMA_ALIGN - 1);
+	frame_size = ALIGN(vh->jpeg_size + solo_enc->jpeg_len, DMA_ALIGN);
 
 	return solo_send_desc(fh, solo_enc->jpeg_len, vbuf, vh->jpeg_off,
 			      frame_size, SOLO_JPEG_EXT_ADDR(solo_dev),
@@ -622,8 +621,7 @@ static int solo_fill_mpeg(struct solo_enc_fh *fh, struct videobuf_buffer *vb,
 	/* Now get the actual mpeg payload */
 	frame_off = (vh->mpeg_off + sizeof(*vh))
 		% SOLO_MP4E_EXT_SIZE(solo_dev);
-	frame_size = (vh->mpeg_size + skip + (DMA_ALIGN - 1))
-		& ~(DMA_ALIGN - 1);
+	frame_size = ALIGN(vh->mpeg_size + skip, DMA_ALIGN);
 
 	return solo_send_desc(fh, skip, vbuf, frame_off, frame_size,
 			      SOLO_MP4E_EXT_ADDR(solo_dev),