diff --git a/[refs] b/[refs] index 92092290b2d0..f5016f119231 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9fd4d3b317a231e47f31d64d66c8cc7765d458f +refs/heads/master: 4d664238207a82c4018757e2d87cf2a780462dcd diff --git a/trunk/drivers/base/dd.c b/trunk/drivers/base/dd.c index ef7db6939cbf..db01b95a47a5 100644 --- a/trunk/drivers/base/dd.c +++ b/trunk/drivers/base/dd.c @@ -171,6 +171,8 @@ int driver_probe_device(struct device_driver * drv, struct device * dev) drv->bus->name, dev->bus_id, drv->name); data = kmalloc(sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; data->drv = drv; data->dev = dev;