diff --git a/[refs] b/[refs]
index 46359c2c0516..a5c9a8b59d75 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3cf790055df7820531068c74ed1a63e2e196da50
+refs/heads/master: ccbc20f9489eed37e2c9a56ff04bb34eabbc9796
diff --git a/trunk/drivers/rtc/rtc-ds1390.c b/trunk/drivers/rtc/rtc-ds1390.c
index f994257981a0..11b70763bb53 100644
--- a/trunk/drivers/rtc/rtc-ds1390.c
+++ b/trunk/drivers/rtc/rtc-ds1390.c
@@ -136,7 +136,7 @@ static int ds1390_probe(struct spi_device *spi)
 		dev_err(&spi->dev, "unable to allocate device memory\n");
 		return -ENOMEM;
 	}
-	dev_set_drvdata(&spi->dev, chip);
+	spi_set_drvdata(spi, chip);
 
 	res = ds1390_get_reg(&spi->dev, DS1390_REG_SECONDS, &tmp);
 	if (res != 0) {