diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-07-13 17:02:12 +0900 |
| commit | 4af358f81881e1d083a916c9269b5ac0936e180d (patch) | |
| tree | c0533d3268daccb6f06f1180aa1ae8f1aac17d36 /drivers/mmc/host/vub300.c | |
| parent | 7653aaab775d4c205a7dce52850c8e3d4f31d4ea (diff) | |
| parent | b63d10130e68aa6480cc1b2483d7c5ce57a05481 (diff) | |
| download | blackbird-obmc-linux-4af358f81881e1d083a916c9269b5ac0936e180d.tar.gz blackbird-obmc-linux-4af358f81881e1d083a916c9269b5ac0936e180d.zip | |
Merge branch 'fbdev/stable-updates'
Diffstat (limited to 'drivers/mmc/host/vub300.c')
| -rw-r--r-- | drivers/mmc/host/vub300.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/drivers/mmc/host/vub300.c b/drivers/mmc/host/vub300.c index cbb03305b77b..d4455ffbefd8 100644 --- a/drivers/mmc/host/vub300.c +++ b/drivers/mmc/host/vub300.c @@ -2096,7 +2096,7 @@ static struct mmc_host_ops vub300_mmc_ops = { static int vub300_probe(struct usb_interface *interface, const struct usb_device_id *id) { /* NOT irq */ - struct vub300_mmc_host *vub300 = NULL; + struct vub300_mmc_host *vub300; struct usb_host_interface *iface_desc; struct usb_device *udev = usb_get_dev(interface_to_usbdev(interface)); int i; @@ -2118,23 +2118,20 @@ static int vub300_probe(struct usb_interface *interface, command_out_urb = usb_alloc_urb(0, GFP_KERNEL); if (!command_out_urb) { retval = -ENOMEM; - dev_err(&vub300->udev->dev, - "not enough memory for the command_out_urb\n"); + dev_err(&udev->dev, "not enough memory for command_out_urb\n"); goto error0; } command_res_urb = usb_alloc_urb(0, GFP_KERNEL); if (!command_res_urb) { retval = -ENOMEM; - dev_err(&vub300->udev->dev, - "not enough memory for the command_res_urb\n"); + dev_err(&udev->dev, "not enough memory for command_res_urb\n"); goto error1; } /* this also allocates memory for our VUB300 mmc host device */ mmc = mmc_alloc_host(sizeof(struct vub300_mmc_host), &udev->dev); if (!mmc) { retval = -ENOMEM; - dev_err(&vub300->udev->dev, - "not enough memory for the mmc_host\n"); + dev_err(&udev->dev, "not enough memory for the mmc_host\n"); goto error4; } /* MMC core transfer sizes tunable parameters */ |
