diff --git a/[refs] b/[refs]
index bd49d57991b5..de997c4cdc68 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 691299201b1416e823bbada0df316c6408167aa7
+refs/heads/master: 97db4b9d02a8fc2f06514f10f6b426b97f6f7a0d
diff --git a/trunk/drivers/net/ethernet/natsemi/xtsonic.c b/trunk/drivers/net/ethernet/natsemi/xtsonic.c
index e01c0a07a93a..7dfe88398d7d 100644
--- a/trunk/drivers/net/ethernet/natsemi/xtsonic.c
+++ b/trunk/drivers/net/ethernet/natsemi/xtsonic.c
@@ -205,6 +205,7 @@ static int __init sonic_probe1(struct net_device *dev)
 	if (lp->descriptors == NULL) {
 		printk(KERN_ERR "%s: couldn't alloc DMA memory for "
 				" descriptors.\n", dev_name(lp->device));
+		err = -ENOMEM;
 		goto out;
 	}