Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6
* 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-next-2.6: Staging: ath6kl: remove empty files that mess with 'distclean' staging: ath6kl: Fixing the driver to use modified mmc_host structure Staging: solo6x10: fix build problem
This commit is contained in:
commit
764e028e24
|
@ -285,9 +285,9 @@ A_STATUS SetupHIFScatterSupport(HIF_DEVICE *device, HIF_DEVICE_SCATTER_SUPPORT_I
|
|||
do {
|
||||
|
||||
/* check if host supports scatter requests and it meets our requirements */
|
||||
if (device->func->card->host->max_hw_segs < MAX_SCATTER_ENTRIES_PER_REQ) {
|
||||
if (device->func->card->host->max_segs < MAX_SCATTER_ENTRIES_PER_REQ) {
|
||||
AR_DEBUG_PRINTF(ATH_DEBUG_ERR,("HIF-SCATTER : host only supports scatter of : %d entries, need: %d \n",
|
||||
device->func->card->host->max_hw_segs, MAX_SCATTER_ENTRIES_PER_REQ));
|
||||
device->func->card->host->max_segs, MAX_SCATTER_ENTRIES_PER_REQ));
|
||||
status = A_ENOTSUP;
|
||||
break;
|
||||
}
|
||||
|
|
|
@ -766,7 +766,7 @@ static int solo_enc_open(struct file *file)
|
|||
&solo_enc->lock,
|
||||
V4L2_BUF_TYPE_VIDEO_CAPTURE,
|
||||
V4L2_FIELD_INTERLACED,
|
||||
sizeof(struct videobuf_buffer), fh);
|
||||
sizeof(struct videobuf_buffer), fh, NULL);
|
||||
|
||||
spin_unlock(&solo_enc->lock);
|
||||
|
||||
|
|
|
@ -437,7 +437,7 @@ static int solo_v4l2_open(struct file *file)
|
|||
&solo_dev->pdev->dev, &fh->slock,
|
||||
V4L2_BUF_TYPE_VIDEO_CAPTURE,
|
||||
SOLO_DISP_PIX_FIELD,
|
||||
sizeof(struct videobuf_buffer), fh);
|
||||
sizeof(struct videobuf_buffer), fh, NULL);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue