From: Jeff Garzik <jgarzik@pobox.com>
Date: Mon, 20 Feb 2006 21:55:56 +0000 (-0500)
Subject: Merge branch 'upstream-fixes'
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f131883e73a8662dc92c3ea371ae9ded0c8f2c37;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'upstream-fixes'
---

f131883e73a8662dc92c3ea371ae9ded0c8f2c37
diff --cc drivers/scsi/libata-core.c
index 62340f4ef004,5f1d7580218d..70efde99f652
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@@ -2586,11 -2510,11 +2586,11 @@@ static void ata_sg_clean(struct ata_que
  	int dir = qc->dma_dir;
  	void *pad_buf = NULL;
  
 -	assert(qc->flags & ATA_QCFLAG_DMAMAP);
 -	assert(sg != NULL);
 +	WARN_ON(!(qc->flags & ATA_QCFLAG_DMAMAP));
 +	WARN_ON(sg == NULL);
  
  	if (qc->flags & ATA_QCFLAG_SINGLE)
- 		WARN_ON(qc->n_elem != 1);
 -		assert(qc->n_elem <= 1);
++		WARN_ON(qc->n_elem > 1);
  
  	VPRINTK("unmapping %u sg elements\n", qc->n_elem);
  
@@@ -2645,8 -2569,8 +2645,8 @@@ static void ata_fill_sg(struct ata_queu
  	struct scatterlist *sg;
  	unsigned int idx;
  
 -	assert(qc->__sg != NULL);
 -	assert(qc->n_elem > 0 || qc->pad_len > 0);
 +	WARN_ON(qc->__sg == NULL);
- 	WARN_ON(qc->n_elem == 0);
++	WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
  
  	idx = 0;
  	ata_for_each_sg(sg, qc) {
diff --cc drivers/scsi/sata_qstor.c
index 286482630be3,80480f0fb2b8..9602f43a298e
--- a/drivers/scsi/sata_qstor.c
+++ b/drivers/scsi/sata_qstor.c
@@@ -276,8 -276,8 +276,8 @@@ static unsigned int qs_fill_sg(struct a
  	unsigned int nelem;
  	u8 *prd = pp->pkt + QS_CPB_BYTES;
  
 -	assert(qc->__sg != NULL);
 -	assert(qc->n_elem > 0 || qc->pad_len > 0);
 +	WARN_ON(qc->__sg == NULL);
- 	WARN_ON(qc->n_elem == 0);
++	WARN_ON(qc->n_elem == 0 && qc->pad_len == 0);
  
  	nelem = 0;
  	ata_for_each_sg(sg, qc) {