func->class, func->vendor, func->device);
}
-struct device_attribute sdio_dev_attrs[] = {
+static struct device_attribute sdio_dev_attrs[] = {
__ATTR_RO(class),
__ATTR_RO(vendor),
__ATTR_RO(device),
struct sdio_driver *drv = to_sdio_driver(dev->driver);
struct sdio_func *func = dev_to_sdio_func(dev);
const struct sdio_device_id *id;
+ int ret;
id = sdio_match_device(func, drv);
if (!id)
return -ENODEV;
+ /* Set the default block size so the driver is sure it's something
+ * sensible. */
+ sdio_claim_host(func);
+ ret = sdio_set_block_size(func, 0);
+ sdio_release_host(func);
+ if (ret)
+ return ret;
+
return drv->probe(func, id);
}
drv->remove(func);
+ if (func->irq_handler) {
+ printk(KERN_WARNING "WARNING: driver %s did not remove "
+ "its interrupt handler!\n", drv->name);
+ sdio_claim_host(func);
+ sdio_release_irq(func);
+ sdio_release_host(func);
+ }
+
return 0;
}
sdio_free_func_cis(func);
+ if (func->info)
+ kfree(func->info);
+
kfree(func);
}
{
struct sdio_func *func;
- func = kmalloc(sizeof(struct sdio_func), GFP_KERNEL);
+ func = kzalloc(sizeof(struct sdio_func), GFP_KERNEL);
if (!func)
return ERR_PTR(-ENOMEM);
- memset(func, 0, sizeof(struct sdio_func));
-
func->card = card;
device_initialize(&func->dev);