---

yaml --- r: 73108 b: refs/heads/master c: 9e66269 h: refs/heads/master v: v3
git-mirror · Nov 4, 2007 · 9ce96d1 · 9ce96d1
1 parent 52b21dc
commit 9ce96d1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 615bb29ccbe9fa06d9f33b29d9c3f51340726656
+refs/heads/master: 9e66269d40229cd9823024120910a43af57a9d72
diff --git a/trunk/drivers/ieee1394/dma.c b/trunk/drivers/ieee1394/dma.c
@@ -103,8 +103,7 @@ int dma_region_alloc(struct dma_region *dma, unsigned long n_bytes,
 		goto err;
 	}
 
-	/* just to be safe - this will become unnecessary once sglist->address goes away */
-	memset(dma->sglist, 0, dma->n_pages * sizeof(*dma->sglist));
+	sg_init_table(dma->sglist, dma->n_pages);
 
 	/* fill scatter/gather list with pages */
 	for (i = 0; i < dma->n_pages; i++) {

diff --git a/trunk/drivers/rtc/rtc-cmos.c b/trunk/drivers/rtc/rtc-cmos.c
@@ -120,8 +120,7 @@ static int cmos_read_alarm(struct device *dev, struct rtc_wkalrm *t)
 	t->time.tm_hour = CMOS_READ(RTC_HOURS_ALARM);
 
 	if (cmos->day_alrm) {
-		/* ignore upper bits on readback per ACPI spec */
-		t->time.tm_mday = CMOS_READ(cmos->day_alrm) & 0x3f;
+		t->time.tm_mday = CMOS_READ(cmos->day_alrm);
 		if (!t->time.tm_mday)
 			t->time.tm_mday = -1;