diff --git a/[refs] b/[refs] index 6263c89f2217..2335ed03d503 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3a2711116073db258224afd2cc0f478bdf305575 +refs/heads/master: 397d6140e93156ecb9cafcd9be0db10ff3c12ab3 diff --git a/trunk/drivers/rtc/rtc-v3020.c b/trunk/drivers/rtc/rtc-v3020.c index a40f400acff6..e28cc4b0901a 100644 --- a/trunk/drivers/rtc/rtc-v3020.c +++ b/trunk/drivers/rtc/rtc-v3020.c @@ -169,9 +169,6 @@ static int rtc_probe(struct platform_device *pdev) if (pdev->resource[0].flags != IORESOURCE_MEM) return -EBUSY; - if (pdev == NULL) - return -EBUSY; - chip = kzalloc(sizeof *chip, GFP_KERNEL); if (!chip) return -ENOMEM;